Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

protect unsafe multithreaded access to httpse cache #1546

Merged
merged 3 commits into from
Feb 1, 2019
Merged

protect unsafe multithreaded access to httpse cache #1546

merged 3 commits into from
Feb 1, 2019

Conversation

bridiver
Copy link
Collaborator

@bridiver bridiver commented Feb 1, 2019 •
edited
Loading

possible fix for brave/brave-browser#2970

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Verified that these changes build without errors on
    • Windows
    • macOS
    • Linux
  • Verified that these changes pass automated tests (npm test brave_unit_tests && npm test brave_browser_tests) on
    • Windows
    • macOS
    • Linux
  • Ran git rebase master (if needed).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed.
  • Add appropriate QA labels (QA/Yes or QA/No) to include the closed issue in milestone

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

@bridiver bridiver self-assigned this Feb 1, 2019
@bridiver bridiver changed the title Issues/2970 protect unsafe multithreaded access to httpse cache Feb 1, 2019
emerick
emerick approved these changes Feb 1, 2019
View reviewed changes
Copy link
Contributor

@emerick emerick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

bbondy
bbondy reviewed Feb 1, 2019
View reviewed changes
components/brave_shields/browser/https_everywhere_recently_used_cache.h
private:
std::unordered_map<std::string, T> data_;
base::Lock lock_;
RingBuffer<T> keysByAge;
Copy link
Member

@bbondy bbondy Feb 1, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe just remove keysByAge and related code? We have git history if we ever want it back.

@bridiver bridiver merged commit 2f4194d into master Feb 1, 2019
@bridiver bridiver deleted the issues/2970 branch February 1, 2019 21:26
bridiver added a commit that referenced this pull request Feb 1, 2019
@bridiver
Merge pull request #1546 from /issues/2970
7ab9d43 
protect unsafe multithreaded access to httpse cache
@bridiver bridiver mentioned this pull request Feb 1, 2019
Merged
18 tasks
bridiver added a commit that referenced this pull request Feb 1, 2019
@bridiver
Merge pull request #1546 from /issues/2970
8ff34d5 
protect unsafe multithreaded access to httpse cache
This was referenced Feb 1, 2019
Merged
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emerick emerick emerick approved these changes

@bbondy bbondy bbondy approved these changes

Assignees

@bridiver bridiver

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bridiver @bbondy @emerick