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

Check SpanOrSize data before using it. #25904

Merged
merged 2 commits into from
Oct 9, 2024
Merged

Check SpanOrSize data before using it. #25904

merged 2 commits into from
Oct 9, 2024

Conversation

goodov
Copy link
Member

@goodov goodov commented Oct 9, 2024 •
edited
Loading

Resolves brave/brave-browser#41512

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:

@goodov goodov added CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS labels Oct 9, 2024
@goodov goodov marked this pull request as ready for review October 9, 2024 08:18
@goodov goodov requested a review from a team as a code owner October 9, 2024 08:18
@goodov goodov merged commit 01b6bd2 into master Oct 9, 2024
19 checks passed
@goodov goodov deleted the issues/41512 branch October 9, 2024 12:19
@github-actions github-actions bot added this to the 1.72.x - Nightly milestone Oct 9, 2024
emerick pushed a commit that referenced this pull request Oct 9, 2024
@goodov @emerick
Check SpanOrSize data before using it. (#25904)
df66a60 
* Check SpanOrSize data before using it.

* Simplify condition.
@emerick emerick mentioned this pull request Oct 9, 2024
Merged
24 tasks
kjozwiak pushed a commit that referenced this pull request Oct 9, 2024
@emerick @cdesouza-chromium
@AlexeyBarabash @fallaciousreasoning @goodov
Upgrade from Chromium 129 to Chromium 130 1.71.x (#25809)
7b4372c 
* Merge pull request #25340 from brave/cr130

Upgrade from Chromium 129 to Chromium 130

* Use `base::StringPrintf` in `constexrp` contexts (#25643)

Upstream has made this function constexpr, in order to force callers to
change its call sites to use a constexpr string, in order to be able to
validate at compile time the format string. There is an alternative
`base::StringPrintfNonConstexpr`, but obviously this unsafe variant
should be avoided whenever possible.

This change goes over the different places where the `constexpr`
constrained was being violated, and corrects each callsite. This has
also revealed a buggy test in `SimulationResponseParserUnitTest`, where
the formatting string wasn't correct.

Chromium change:
https://chromium.googlesource.com/chromium/src/+/8bf39fbefcd2963b3647c24f2b27dfb5c40875c4

commit 8bf39fbefcd2963b3647c24f2b27dfb5c40875c4
Author: Peter Kasting <[email protected]>
Date:   Fri Sep 13 19:07:33 2024 +0000

    Disallow StringPrintf() with non-constexpr format strings.

    Bug: 365705855

* Fixed crash at Content Filtering (#25812)

fixes brave/brave-browser#41402

Crash happened at app menu => Settings => Brave Shields & privacy => Content Filtering.

Tombstone
```
java.lang.ClassCastException: org.chromium.chrome.browser.settings.SettingsActivity cannot be cast to org.chromium.chrome.browser.settings.BraveSettingsActivity
at org.chromium.chrome.browser.shields.ContentFilteringFragment.onAttach(ContentFilteringFragment.java:86)
```

Upstream had added a new place to create Intent for Settings activity.

Related Chromium change:
https://source.chromium.org/chromium/chromium/src/+/d4af6a2c4ccc6427aa7df0f2beacf61793459e66

	[Settings] Introduce a central place to construct intents

	SettingsIntentUtil becomes the central place to construct intents
	launching the settings activity.

	Bug: b/356743945
	Change-Id: Id6988af4a182fe6603bb02c9dae8b2ac48f80fed
	Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5832868

* Merge pull request #25832 from brave/cr130-followup-fix-task-manager-colors

[CR130] Task manager background color is red

* [Downloads]: Fix progress bar color (#25865)

* Merge pull request #25861 from brave/cr130-fix-downloads-page-colors

Fix downloads page colors

* Check SpanOrSize data before using it. (#25904)

* Check SpanOrSize data before using it.

* Simplify condition.

* Merge pull request #25887 from brave/cr130-followup-fix-brandcode-config-fetcher-patch

Run brandcode fetch callback asynchronously

---------

Co-authored-by: cdesouza-chromium <[email protected]>
Co-authored-by: AlexeyBarabash <[email protected]>
Co-authored-by: Jay Harris <[email protected]>
Co-authored-by: Aleksei Khoroshilov <[email protected]>
@brave-builds
Copy link
Collaborator

Released in v1.72.76

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@iefremov iefremov iefremov approved these changes

@cdesouza-chromium cdesouza-chromium Awaiting requested review from cdesouza-chromium

Assignees

@goodov goodov

Labels
CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS
Projects
None yet
Milestone
1.72.x - Beta
Development

Successfully merging this pull request may close these issues.

PageGraph crash after cr130
3 participants
@goodov @brave-builds @iefremov