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 2 changes from 2-M124 #42008

Merged
merged 2 commits into from May 6, 2024

Conversation

ppontes
Copy link
Member

@ppontes ppontes commented Apr 30, 2024

electron/security#504 - 98bcf9ef5cdd from chromium [M124][document pip] Don't assume the enter event window is a LocalDOMWindow

This CL changes DocumentPictureInPictureEvent to store a DOMWindow
instead of a LocalDOMWindow to prevent crashes when the window it gets
is actually a RemoteDOMWindow.

(cherry picked from commit 2314741cdf2c4a6e11234dda7006ec0dd9005bbb)

Bug: 335003891
Change-Id: I86a0ec5a89b51a26d5dd89559f86e6e4d6c3e8fe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5467978
Commit-Queue: Tommy Steimel [email protected]
Reviewed-by: Frank Liberato [email protected]
Cr-Original-Commit-Position: refs/heads/main@{#1290122}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5477908
Auto-Submit: Tommy Steimel [email protected]
Commit-Queue: Frank Liberato [email protected]
Cr-Commit-Position: refs/branch-heads/6367@{#974}
Cr-Branched-From: d158c6dc6e3604e6f899041972edf26087a49740-refs/heads/main@{#1274542}

electron/security#505 - bd7aa9779873 from DirectXShaderCompiler Fixed crash in loop unroll caused by bug in structurize loop exits (#6548)

Fixed a bug in hlsl::RemoveUnstructuredLoopExits where when a new
exiting block is created from splitting, it was added to the current
loop being processed, when it could also part of an inner loop. Not
adding the new block to inner loops that it's part of makes the inner
loops malformed, and causes crash.

This fix adds the new block to the inner most loop that it should be
part of. Also adds the StructurizeLoopExits option to loop-unroll
pass, which was missing before.

Bug: chromium:333508731
Change-Id: I7efc21bc61aeb81b4906a600c35272af232710ea
Reviewed-on: https://chromium-review.googlesource.com/c/external/github.com/microsoft/DirectXShaderCompiler/+/5490380
Reviewed-by: James Price [email protected]
Reviewed-by: Ben Clayton [email protected]

Notes:

  • Security: backported fix for 335003891.
  • Security: backported fix for 333508731.

@ppontes ppontes requested a review from a team as a code owner April 30, 2024 23:39
@ppontes ppontes added security 🔒 semver/patch backwards-compatible bug fixes backport-check-skip Skip trop's backport validity checking 28-x-y labels Apr 30, 2024
ppontes and others added 2 commits May 2, 2024 07:31
* 98bcf9ef5cdd from chromium
* bd7aa9779873 from DirectXShaderCompiler
@ppontes ppontes force-pushed the cherry-pick/security/28-x-y/2-m124 branch from 98fb795 to eb9fb52 Compare May 2, 2024 14:32
@codebytere codebytere merged commit dc8a39c into 28-x-y May 6, 2024
13 checks passed
@codebytere codebytere deleted the cherry-pick/security/28-x-y/2-m124 branch May 6, 2024 10:26
Copy link

release-clerk bot commented May 6, 2024

Release Notes Persisted

  • Security: backported fix for 335003891.
  • Security: backported fix for 333508731.

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

2 participants