chore: cherry-pick 2 changes from Release-3-M119 #40647
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
electron/security#432 - 971d6055e7b7 from openscreen
[Cast Streaming] fix heap use-after-freeThis patch fixes a use after free, caused by using an iterator
after it has been invalidated by a call to std::map::erase().
Bug: 1491210
Change-Id: I0c546eb6474af82f052b89e819a4886a004270f0
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/4981212
Reviewed-by: Mark Foltz mfoltz@chromium.org
Commit-Queue: Jordan Bayles jophba@chromium.org
Reviewed-by: Muyao Xu muyaoxu@google.com
electron/security#432 - 6169a1fabae1 from skia
Avoid combining extremely large meshes.Bug: chromium:1505053
Change-Id: I42f2ff872bbf054686ec7af0cc85ff63055fcfbf
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/782936
Commit-Queue: Michael Ludwig michaelludwig@google.com
Reviewed-by: Michael Ludwig michaelludwig@google.com
Auto-Submit: John Stiles johnstiles@google.com
Notes: