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

chore: cherry-pick 63686953dc22 from chromium #38062

Merged
merged 2 commits into from Apr 23, 2023

Conversation

ppontes
Copy link
Member

@ppontes ppontes commented Apr 21, 2023

Add lock to AlternativeStateNameMap.

To prevent the class from accessing its localized_state_names_map_ and
localized_state_names_reverse_lookup_map_ members, a lock is added. It
locks all reads/write from the aforementioned members.

(cherry picked from commit dd848883aa0d7d88520846bbf6735eaae9f2b60e)

Bug: 1360571, 1414241, 1425951
Change-Id: Ic01b0cba3878748617863274deb04ec9e13645d4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4352658
Reviewed-by: Christoph Schwering schwering@google.com
Commit-Queue: Florian Leimgruber fleimgruber@google.com
Cr-Original-Commit-Position: refs/heads/main@{#1119411}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4402262
Auto-Submit: Florian Leimgruber fleimgruber@google.com
Cr-Commit-Position: refs/branch-heads/5615@{#1147}
Cr-Branched-From: 9c6408ef696e83a9936b82bbead3d41c93c82ee4-refs/heads/main@{#1109224}

Notes: Security: backported fix for 1360571.

@ppontes ppontes requested a review from a team as a code owner April 21, 2023 14:15
@ppontes ppontes added security 🔒 semver/patch backwards-compatible bug fixes backport-check-skip Skip trop's backport validity checking 22-x-y labels Apr 21, 2023
@electron-cation electron-cation bot added new-pr 🌱 PR opened in the last 24 hours and removed new-pr 🌱 PR opened in the last 24 hours labels Apr 21, 2023
@codebytere codebytere merged commit 85317c3 into 22-x-y Apr 23, 2023
13 checks passed
@codebytere codebytere deleted the cherry-pick/22-x-y/chromium/63686953dc22 branch April 23, 2023 20:15
@release-clerk
Copy link

release-clerk bot commented Apr 23, 2023

Release Notes Persisted

Security: backported fix for 1360571.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
22-x-y backport-check-skip Skip trop's backport validity checking security 🔒 semver/patch backwards-compatible bug fixes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants