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 2e7c9b33453b from chromium #31497

Merged
merged 2 commits into from
Oct 21, 2021

Conversation

ppontes
Copy link
Member

@ppontes ppontes commented Oct 20, 2021

Speculative fix for eye dropper getColor crash.

There seems to be a situation where the captured frame coordinates
are different than the ones accessible by moving the mouse.

I am not able to locally reproduce this issue, so I am adding DCHECKs
to validate that the coordinates are correct and I am also handling
the invalid coordinates to prevent invalid memory access.

(cherry picked from commit a656373ae7212e0d88474bdec4691a4152452748)

Bug: 1246631
Change-Id: I915d46a71aa73b5dcf08127d347fdd47c1ddf54c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3152423
Reviewed-by: Mason Freed masonf@chromium.org
Commit-Queue: Ionel Popescu iopopesc@microsoft.com
Cr-Original-Commit-Position: refs/heads/main@{#920811}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3163070
Auto-Submit: Ionel Popescu iopopesc@microsoft.com
Commit-Queue: Rubber Stamper rubber-stamper@appspot.gserviceaccount.com
Bot-Commit: Rubber Stamper rubber-stamper@appspot.gserviceaccount.com
Cr-Commit-Position: refs/branch-heads/4638@{#75}
Cr-Branched-From: 159257cab5585bc8421abf347984bb32fdfe9eb9-refs/heads/main@{#920003}

Notes: Backported fix for CVE-2021-37981.

@ppontes ppontes requested a review from a team as a code owner October 20, 2021 21:37
@ppontes ppontes added 15-x-y backport-check-skip Skip trop's backport validity checking semver/patch backwards-compatible bug fixes labels Oct 20, 2021
@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 Oct 20, 2021
@jkleinsc jkleinsc merged commit 7e66d6a into 15-x-y Oct 21, 2021
@jkleinsc jkleinsc deleted the cherry-pick/15-x-y/chromium/2e7c9b33453b branch October 21, 2021 19:15
@release-clerk
Copy link

release-clerk bot commented Oct 21, 2021

Release Notes Persisted

Backported fix for CVE-2021-37981.

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