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 59f3ca2780 from chromium #27794

Merged
merged 2 commits into from Feb 18, 2021

Conversation

deepak1556
Copy link
Member

Fix heap overflow in VideoFrameYUVConverter

Currently with some texture sizes GLES2Util::ComputeImageDataSizesES3
will attempt to add row padding when calculating the size of a
VideoFrame plane. This is because it's currently assumed that each row
aligns on a 4 byte boundary based on GL_UNPACK_ALIGNMENT but
VideoFrames make no such guarantee as they may be densely packed.
This CL removes the GL_UNPACK_ALIGNMENT assumption so that we only use
the VideoFrame's stride when calculating padding.

(cherry picked from commit 7de5d0ecb5a4f73aeffe15d825bf694d0d8e2a08)

Bug: 1166504, 1161131
Change-Id: I2484f5dfd2ad85b088fee57758776a5c9bd01d95
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2642765
Reviewed-by: Vasiliy Telezhnikov vasilyt@chromium.org
Commit-Queue: Nathan Zabriskie nazabris@microsoft.com
Cr-Original-Commit-Position: refs/heads/master@{#846298}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2679121
Bot-Commit: Rubber Stamper rubber-stamper@appspot.gserviceaccount.com
Auto-Submit: Nathan Zabriskie nazabris@microsoft.com
Cr-Commit-Position: refs/branch-heads/4324@{#2115}
Cr-Branched-From: c73b5a651d37a6c4d0b8e3262cc4015a5579c6c8-refs/heads/master@{#827102}

Notes: Security: backported fix for 1166504.

@deepak1556 deepak1556 requested a review from a team as a code owner February 18, 2021 19:52
@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Feb 18, 2021
@deepak1556 deepak1556 added 10-x-y backport-check-skip Skip trop's backport validity checking semver/patch backwards-compatible bug fixes labels Feb 18, 2021
@electron-cation electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label Feb 18, 2021
@deepak1556 deepak1556 merged commit a217df4 into 10-x-y Feb 18, 2021
@release-clerk
Copy link

release-clerk bot commented Feb 18, 2021

Release Notes Persisted

Security: backported fix for 1166504.

@deepak1556 deepak1556 deleted the robo/backport_1166504_10_x branch February 18, 2021 21:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10-x-y backport-check-skip Skip trop's backport validity checking semver/patch backwards-compatible bug fixes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants