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.

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

[ubsan] Fix broken TestingPrefServiceSimple downcasts #25839

Merged

Conversation

cdesouza-chromium
Copy link
Collaborator

@cdesouza-chromium cdesouza-chromium commented Oct 7, 2024

The return type for this function has changed for a while now, so it appears we have been running over undefined behaviour all along.

This change corrects the downcast to match the type returned by GetPrefs(), namely, SearchEnginesTestEnvironment, which in turn has sync_preferences::TestingPrefServiceSyncable for its own prefs_service() method.

Chromium changes:
https://chromium.googlesource.com/chromium/src/+/2862d7f6b0842b53209c8038ec54eba132b55d8b https://chromium.googlesource.com/chromium/src/+/28881de3ad0bc41236fb00a794939ec7c0bff819

commit 2862d7f6b0842b53209c8038ec54eba132b55d8b
Author: Jack Yammine <[email protected]>
Date:   Thu Jul 18 11:20:17 2024 +0000

    Remove deprecated TemplateURLService constructor used in tests

    This is part of a multi-CL change [2/4].

    We remove the TemplateURLService constructor that was only used for
    tests and update the tests accordingly.

    Bug: 40287734

commit 28881de3ad0bc41236fb00a794939ec7c0bff819
Author: Jack Yammine <[email protected]>
Date:   Fri Jul 12 12:11:33 2024 +0000

    Correctly initialize TemplateURLService in tests

    We currently pass nullptr for PrefService and SearchEngineChoiceService
    in tests. This leads to having code paths in production that need
    to handle theses cases.

    This is part of a multi-CL change.

    Bug: 40287734

Resolves brave/brave-browser#41435

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 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:

The return type for this function has changed for a while now, so it
appears we have been running over undefined behaviour all along.

This change corrects the downcast to match the type returned by
`GetPrefs()`, namely, `SearchEnginesTestEnvironment`, which in turn has
` sync_preferences::TestingPrefServiceSyncable` for its own
`prefs_service()` method.

Chromium changes:
https://chromium.googlesource.com/chromium/src/+/2862d7f6b0842b53209c8038ec54eba132b55d8b
https://chromium.googlesource.com/chromium/src/+/28881de3ad0bc41236fb00a794939ec7c0bff819

commit 2862d7f6b0842b53209c8038ec54eba132b55d8b
Author: Jack Yammine <[email protected]>
Date:   Thu Jul 18 11:20:17 2024 +0000

    Remove deprecated TemplateURLService constructor used in tests

    This is part of a multi-CL change [2/4].

    We remove the TemplateURLService constructor that was only used for
    tests and update the tests accordingly.

    Bug: 40287734

commit 28881de3ad0bc41236fb00a794939ec7c0bff819
Author: Jack Yammine <[email protected]>
Date:   Fri Jul 12 12:11:33 2024 +0000

    Correctly initialize TemplateURLService in tests

    We currently pass nullptr for PrefService and SearchEngineChoiceService
    in tests. This leads to having code paths in production that need
    to handle theses cases.

    This is part of a multi-CL change.

    Bug: 40287734
@cdesouza-chromium cdesouza-chromium merged commit 2978dc1 into master Oct 7, 2024
18 checks passed
@cdesouza-chromium cdesouza-chromium deleted the fix-broken-testing-pref-service-simple-downcast branch October 7, 2024 10:14
@github-actions github-actions bot added this to the 1.72.x - Nightly milestone Oct 7, 2024
@brave-builds
Copy link
Collaborator

Released in v1.72.66

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.

Downcasts for TestingPrefServiceSimple are incorrect
3 participants