Skip to content

replace dchecks in EnableFilterList with conditional early returns #19756

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.

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

Merged
merged 1 commit into from
Aug 18, 2023

Conversation

antonok-edm
Copy link
Collaborator

@antonok-edm antonok-edm commented Aug 17, 2023

Resolves brave/brave-browser#14123
(See also brave/brave-browser#31561)

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run lint, npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

See brave/brave-browser#14123 - there should be no crash

@@ -237,14 +237,18 @@ void AdBlockRegionalServiceManager::EnableFilterList(const std::string& uuid,
DCHECK(catalog_entry != filter_list_catalog_.end());
Copy link
Member

Choose a reason for hiding this comment

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

what about this one?

Copy link
Collaborator

@atuchin-m atuchin-m left a comment

Choose a reason for hiding this comment

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

LGTM with a nit about DCHECK(catalog_entry != filter_list_catalog_.end());

@antonok-edm antonok-edm force-pushed the remove-enable-filter-lists-dchecks branch from 0f9290b to 07c72ac Compare August 18, 2023 08:45
@antonok-edm antonok-edm enabled auto-merge August 18, 2023 08:46
@kjozwiak
Copy link
Member

Verification PASSED on Pixel 6 running Android 14 using the following build(s):

Brave | 1.59.35 Chromium: 116.0.5845.96 (Official Build) canary (64-bit)
--- | ---
Revision | ee59f36b912d22844907d1339383d3c7ca7bb0d4
OS | Android 14; Build/UPB5.230623.003; 34; REL

I couldn't reproduce the original issue/crash using 1.59.26 Chromium: 116.0.5845.96 following the STR/Cases outlined via brave/brave-browser#14123 (comment). I went through the same STR/Cases using 1.59.35 Chromium: 116.0.5845.96 which includes the following PR and ensured that there was no crashes/issues as per the following:

screen-20230821-174600.mp4

kjozwiak pushed a commit that referenced this pull request Aug 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

brave://adblock crashes browser after interaction from multiple tabs
4 participants