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 1-M124 #41982

Merged
merged 2 commits into from Apr 29, 2024

Conversation

ppontes
Copy link
Member

@ppontes ppontes commented Apr 27, 2024

electron/security#494 - bc18aec94c82 from DirectXShaderCompiler Replace dynamic_cast with virtual call (#6515)

Make TextDiagnosticPrinter::setPrefix a virtual function in base class
DiagnosticConsumer. This allows us to avoid using dynamic_cast in
BackendConsumer::DxilDiagHandler, required for codebases that do not
enable RTTI. This is also the only place in the codebase that uses RTTI
(AFAICT).

Bug: chromium:333420620
Change-Id: Ida73077f24fdb4b705b5d868b04ac6cfecb30327
Reviewed-on: https://chromium-review.googlesource.com/c/external/github.com/microsoft/DirectXShaderCompiler/+/5464347
Reviewed-by: dan sinclair dsinclair@chromium.org
Reviewed-by: David Neto dneto@google.com

electron/security#493 - ba3b4e239620 from angle M123: SPIR-V: Fix const constructors with single scalar

These constructors may be generated because of
RemoveArrayLengthTraverser.

Bug: chromium:332546345
Change-Id: I2b2bf3728ef5bae148abc2a8518f8f3f42850025
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5462388
(cherry picked from commit 0b776d32f69a932acb61963d9daad9e13f610944)
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5473406
Reviewed-by: Shahbaz Youssefi syoussefi@chromium.org
Reviewed-by: Geoff Lang geofflang@chromium.org
Reviewed-by: Daniel Gagnon dgagnon@google.com

Notes:

* bc18aec94c82 from DirectXShaderCompiler
* ba3b4e239620 from angle
@ppontes ppontes requested a review from a team as a code owner April 27, 2024 23:55
@ppontes ppontes added security 🔒 semver/patch backwards-compatible bug fixes backport-check-skip Skip trop's backport validity checking 29-x-y labels Apr 27, 2024
@ppontes ppontes marked this pull request as draft April 27, 2024 23:56
@ppontes ppontes marked this pull request as ready for review April 27, 2024 23:56
@jkleinsc jkleinsc merged commit 9d4f8a0 into 29-x-y Apr 29, 2024
13 checks passed
@jkleinsc jkleinsc deleted the cherry-pick/security/29-x-y/1-m124 branch April 29, 2024 13:26
Copy link

release-clerk bot commented Apr 29, 2024

Release Notes Persisted

  • Security: backported fix for CVE-2024-4060.
  • Security: backported fix for CVE-2024-4058.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

patches/DirectXShaderCompiler/.patches

Copy link

@rezababaeeeiii rezababaeeeiii left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

patches/angle/cherry-pick-ba3b4e239620.patch

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