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 5c41beab6 from chromium #32798

Merged
merged 4 commits into from Feb 10, 2022

Conversation

deepak1556
Copy link
Member

Subject: Take local copy of UMP::local_sources to iterate

Take a local copy of UserMediaProcessor::local_sources_ when iterating
over it in UserMediaProcessor::DetermineExistingAudioSessionId, as the
list can be effectively concurrently modified during destruction of
MediaStreamTracks triggered by GC during this loop. Without the copy
this leads to a container overflow.

(cherry picked from commit fb6232ffb1fec14d64ec8815f7dfc2cea0887588)

Bug: 1238209
Change-Id: I048387a51a58eacff87d220e6b67d2d09f610c1d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3320283
Reviewed-by: Henrik Boström hbos@chromium.org
Commit-Queue: Tony Herre toprice@chromium.org
Cr-Original-Commit-Position: refs/heads/main@{#950499}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3337896
Reviewed-by: Guido Urdaneta guidou@chromium.org
Cr-Commit-Position: refs/branch-heads/4664@{#1303}
Cr-Branched-From: 24dc4ee75e01a29d390d43c9c264372a169273a7-refs/heads/main@{#929512}

Notes: Security: backported fix for chromium:1238209

@deepak1556 deepak1556 requested a review from a team as a code owner February 8, 2022 09:42
@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Feb 8, 2022
@deepak1556 deepak1556 added 15-x-y backport-check-skip Skip trop's backport validity checking security 🔒 semver/patch backwards-compatible bug fixes labels Feb 8, 2022
@electron-cation electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label Feb 8, 2022
@zcbenz zcbenz merged commit 6c1f9f8 into 15-x-y Feb 10, 2022
@zcbenz zcbenz deleted the robo/cherry_pick_3337896_15_x_y branch February 10, 2022 10:36
@release-clerk
Copy link

release-clerk bot commented Feb 10, 2022

Release Notes Persisted

Security: backported fix for chromium:1238209

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
15-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

4 participants