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 d9556a80a790 from chromium #29817

Merged
merged 2 commits into from Jun 22, 2021

Conversation

@ppontes
Copy link
Member

@ppontes ppontes commented Jun 21, 2021

A few fixes to the D3D11H264Accelerator

  • Adds a AsD3D11H264Picture method to H264Pictures because sometimes
    there can be just normal H264Pictures in the DPB and this could cause
    some invalid variable access as we were statically casting the
    pointer before.

  • Adds a bounds check just in case there are more than 16 items in the
    DPB.

(cherry picked from commit 5a3cf91d0f2352e697017e13f4754989f46f2f3e)

Bug: 1194689
Change-Id: Ief2e1d00b451fbc0585dd0b22b5aff7a6918fa11
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2923118
Commit-Queue: Ted Meyer tmathmeyer@chromium.org
Reviewed-by: Frank Liberato liberato@chromium.org
Cr-Original-Commit-Position: refs/heads/master@{#888267}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2944579
Auto-Submit: Ted Meyer tmathmeyer@chromium.org
Commit-Queue: Rubber Stamper rubber-stamper@appspot.gserviceaccount.com
Bot-Commit: Rubber Stamper rubber-stamper@appspot.gserviceaccount.com
Cr-Commit-Position: refs/branch-heads/4472@{#1455}
Cr-Branched-From: 3d60439cfb36485e76a1c5bb7f513d3721b20da1-refs/heads/master@{#870763}

Notes: Security: backported fix for chromium:1194689.

zcbenz
zcbenz approved these changes Jun 22, 2021
@zcbenz zcbenz merged commit 47d7684 into 11-x-y Jun 22, 2021
13 of 16 checks passed
@zcbenz zcbenz deleted the cherry-pick/11-x-y/chromium/d9556a80a790 branch Jun 22, 2021
@release-clerk
Copy link

@release-clerk release-clerk bot commented Jun 22, 2021

Release Notes Persisted

Security: backported fix for chromium:1194689.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants