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 9ad8c9610d0a from chromium #25241

Merged
merged 3 commits into from Sep 2, 2020

Conversation

@nornagon
Copy link
Member

@nornagon nornagon commented Aug 31, 2020

[M84] Use copy of source map in MediaElementElementListener::UpdateSources()

Prior to this CL, this function iterated over a source map that could
be modified by a re-entrant call triggered by JS code.

(cherry picked from commit 292ac9aa5ba263f63f761e03b8214cae21e667c9)

Bug: 1105426
Change-Id: I47e49e4132cba98e12ee7c195720ac9ecc1f485b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2312703
Reviewed-by: Marina Ciocea marinaciocea@chromium.org
Commit-Queue: Guido Urdaneta guidou@chromium.org
Cr-Original-Commit-Position: refs/heads/master@{#790894}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2332823
Reviewed-by: Guido Urdaneta guidou@chromium.org
Cr-Commit-Position: refs/branch-heads/4147@{#1026}
Cr-Branched-From: 16307825352720ae04d898f37efa5449ad68b606-refs/heads/master@{#768962}

Notes: Security: backported fix for 1105426.

@nornagon nornagon requested a review from electron/wg-upgrades as a code owner Aug 31, 2020
@nornagon nornagon merged commit 9db7354 into 8-x-y Sep 2, 2020
11 of 15 checks passed
11 of 15 checks passed
@azure-pipelines
electron-arm64-testing Build #20200902.29 had test failures
Details
@appveyor
appveyor: win-ia32-testing Waiting for AppVeyor build to complete
Details
@appveyor
appveyor: win-woa-testing Waiting for AppVeyor build to complete
Details
@appveyor
appveyor: win-x64-testing Waiting for AppVeyor build to complete
Details
@trop
Valid Backport Backport Check Skipped
Details
@electron-archaeologist
Artifact Comparison No Changes
Details
@semantic-pull-requests
Semantic Pull Request ready to be squashed
Details
@wip
WIP Ready for review
Details
@appveyor
appveyor: win-ia32-testing-pr AppVeyor build succeeded
Details
@appveyor
appveyor: win-x64-testing-pr AppVeyor build succeeded
Details
@circleci-checks
build-linux Workflow: build-linux
Details
@circleci-checks
build-mac Workflow: build-mac
Details
@azure-pipelines
electron-arm-testing Build #20200902.28 succeeded
Details
@circleci-checks
lint Workflow: lint
Details
@release-clerk
release-notes Release notes found
@release-clerk
Copy link

@release-clerk release-clerk bot commented Sep 2, 2020

Release Notes Persisted

Security: backported fix for 1105426.

@nornagon nornagon deleted the cherry-pick/8-x-y/chromium/9ad8c9610d0a branch Sep 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants