generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Fixing out of bounds access in frame_refs[] array."

Browse Source
This commit is contained in:
Yaowu Xu
2014-01-30 09:34:18 -08:00
committed by Gerrit Code Review
parent 127f0a0c5f 1bd69ac57f
commit c0856b98cc
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vp9/encoder/vp9_onyx_int.h
View File

@@ -756,8 +756,10 @@ static int get_token_alloc(int mb_rows, int mb_cols) {
static void set_ref_ptrs(VP9_COMMON *cm, MACROBLOCKD *xd, static void set_ref_ptrs(VP9_COMMON *cm, MACROBLOCKD *xd,
MV_REFERENCE_FRAME ref0, MV_REFERENCE_FRAME ref1) { MV_REFERENCE_FRAME ref0, MV_REFERENCE_FRAME ref1) {
xd->block_refs[0] = &cm->frame_refs[ref0 - LAST_FRAME]; xd->block_refs[0] = &cm->frame_refs[ref0 >= LAST_FRAME ? ref0 - LAST_FRAME
xd->block_refs[1] = &cm->frame_refs[ref1 - LAST_FRAME]; : 0];
xd->block_refs[1] = &cm->frame_refs[ref1 >= LAST_FRAME ? ref1 - LAST_FRAME
: 0];
} }
#ifdef __cplusplus #ifdef __cplusplus