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

Merge "vp9_copy_reference_dec: check ref frame index before use"

Browse Source
This commit is contained in:
James Zern 2014-08-14 18:53:39 -07:00 committed by Gerrit Code Review
commit 1043474665
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vp9/decoder/vp9_decoder.c
View File

@ -123,8 +123,12 @@ vpx_codec_err_t vp9_copy_reference_dec(VP9Decoder *pbi,
* later commit that adds VP9-specific controls for this functionality. * later commit that adds VP9-specific controls for this functionality.
*/ */
if (ref_frame_flag == VP9_LAST_FLAG) { if (ref_frame_flag == VP9_LAST_FLAG) {
const YV12_BUFFER_CONFIG *const cfg = const YV12_BUFFER_CONFIG *const cfg = get_ref_frame(cm, 0);
&cm->frame_bufs[cm->ref_frame_map[0]].buf; if (cfg == NULL) {
vpx_internal_error(&cm->error, VPX_CODEC_ERROR,
"No 'last' reference frame");
return VPX_CODEC_ERROR;
}
if (!equal_dimensions(cfg, sd)) if (!equal_dimensions(cfg, sd))
vpx_internal_error(&cm->error, VPX_CODEC_ERROR, vpx_internal_error(&cm->error, VPX_CODEC_ERROR,
"Incorrect buffer dimensions"); "Incorrect buffer dimensions");