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 3ac8883297e1 from chromium #23013

Merged
merged 3 commits into from Apr 9, 2020

Conversation

nornagon
Copy link
Member

@nornagon nornagon commented Apr 8, 2020

Break connections before removing from active_source_handlers_.

In DeferredTaskHandler::BreakConnections, we want to remove finished
handlers and break the connection. when a finished handler is removed
from active_source_handlers_, it might be deleted, but we were still
using that to create the connection. Instead, break the connection
first and then remove it.

Manually ran test from the bug and it passes with this change. Without
this, it failed right away.

Bug: 1057593
Change-Id: I3c9346a6842f412100d608876adb268befb80470
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2083436
Commit-Queue: Raymond Toy rtoy@chromium.org
Reviewed-by: Hongchan Choi hongchan@chromium.org
Cr-Commit-Position: refs/heads/master@{#746142}

Notes: Security: backported fix for CVE-2020-6428: Use after free in audio.

@nornagon nornagon requested a review from a team as a code owner April 8, 2020 00:41
@nornagon nornagon added 7-2-x backport-check-skip Skip trop's backport validity checking labels Apr 8, 2020
@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 8, 2020
@deepak1556
Copy link
Member

Changes are in webaudio codepath, but content tracing specs have failed in both mas and osx builds. Not sure whats happening here, but should be a flake. Retriggered tests.

@nornagon
Copy link
Member Author

nornagon commented Apr 9, 2020

skipping most CI as there's minimal changes since last green.

@nornagon nornagon merged commit 8dcf7fc into 7-2-x Apr 9, 2020
@release-clerk
Copy link

release-clerk bot commented Apr 9, 2020

Release Notes Persisted

Security: backported fix for CVE-2020-6428: Use after free in audio.

@nornagon nornagon deleted the cherry-pick/7-2-x/chromium/3ac8883297e1 branch April 9, 2020 21:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
7-2-x backport-check-skip Skip trop's backport validity checking
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants