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 ecad352cd614 from chromium #34689

Merged
merged 5 commits into from Jul 25, 2022

Conversation

nornagon
Copy link
Member

Add Stop method to BatchingMediaLog

Now that ~MediaLog is posted for a later destruction due to garbage
collector ownership of CodecLogger, it's possible for the
SendQueuedMediaEvents call from ~BatchingMediaLog to reference
InspectorMediaEventHandler::inspector_context_ after it has been freed.

This fix forces BatchingMediaLog to shut down it's logging capabilities
when the destruction call is caused by the garbage collector deletion
phase

R=​liberato

(cherry picked from commit 1bbfaf23cd8a1e977cb445a82a4caae107632a59)

Bug: 1333333
Change-Id: I0bdca72a71177c4c5a6a9dc692aad3de4c25f4e2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3689639
Commit-Queue: Ted (Chromium) Meyer tmathmeyer@chromium.org
Reviewed-by: Eugene Zemtsov eugene@chromium.org
Cr-Original-Commit-Position: refs/heads/main@{#1011247}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3694435
Auto-Submit: Ted (Chromium) Meyer tmathmeyer@chromium.org
Reviewed-by: Eugene Zemtsov ezemtsov@google.com
Commit-Queue: Eugene Zemtsov eugene@chromium.org
Cr-Commit-Position: refs/branch-heads/5060@{#672}
Cr-Branched-From: b83393d0f4038aeaf67f970a024d8101df7348d1-refs/heads/main@{#1002911}

Ref electron/security#174

Notes: Security: backported fix for 1333333.

@nornagon nornagon requested review from a team as code owners June 21, 2022 20:56
@nornagon nornagon added 18-x-y backport-check-skip Skip trop's backport validity checking security 🔒 semver/patch backwards-compatible bug fixes labels Jun 21, 2022
@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 Jun 21, 2022
@nornagon nornagon merged commit c5918ac into 18-x-y Jul 25, 2022
@nornagon nornagon deleted the cherry-pick/18-x-y/chromium/ecad352cd614 branch July 25, 2022 22:44
@release-clerk
Copy link

release-clerk bot commented Jul 25, 2022

Release Notes Persisted

Security: backported fix for 1333333.

@nornagon
Copy link
Member Author

/trop run backport-to 19-x-y

@trop
Copy link
Contributor

trop bot commented Jul 25, 2022

The backport process for this PR has been manually initiated - sending your PR to 19-x-y!

@trop
Copy link
Contributor

trop bot commented Jul 25, 2022

I have automatically backported this PR to "19-x-y", please check out #35053

VerteDinde pushed a commit that referenced this pull request Nov 28, 2022
* chore: cherry-pick ecad352cd614 from chromium (#34689)

* Update .patches

* resolve conflicts

Co-authored-by: Jeremy Rose <jeremya@chromium.org>
Co-authored-by: Milan Burda <milan.burda@gmail.com>
Co-authored-by: Milan Burda <miburda@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
18-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