Decoder: Fixes an out of bound write in bitstream buffer am: 33ef7de9dd

am: 0aab4958fb

Change-Id: Ia5020ba3bfb95390578a82c602d71865443f1c00
This commit is contained in:
Harish Mahendrakar 2017-02-13 18:47:15 +00:00 committed by android-build-merger
commit 9f72b6eca1

View file

@ -1956,7 +1956,9 @@ WORD32 ih264d_video_decode(iv_obj_t *dec_hdl, void *pv_api_ip, void *pv_api_op)
if(buflen == -1)
buflen = 0;
/* Ignore bytes beyond the allocated size of intermediate buffer */
buflen = MIN(buflen, buf_size);
/* Since 8 bytes are read ahead, ensure 8 bytes are free at the
end of the buffer, which will be memset to 0 after emulation prevention */
buflen = MIN(buflen, buf_size - 8);
bytes_consumed = buflen + u4_length_of_start_code;
ps_dec_op->u4_num_bytes_consumed += bytes_consumed;