wrapper/libhevc-mirror
1
0
Fork 0
mirror of https://github.com/ittiam-systems/libhevc.git synced 2026-08-14 23:02:35 +07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge "Fix OOB issue in nal unit parsing" into lmp-dev am: 1ce65aea9f am: c1451ed95b

Browse source 
am: 18a325cf80

Change-Id: I83294b270ac8f6853dce67076b497d2744aed571
This commit is contained in:
Naveen Kumar P 2017-06-06 20:54:48 +00:00 • committed by android-build-merger
commit f9a3d7de57
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
decoder/ihevcd_nal.c
View file

@ -114,7 +114,8 @@ WORD32 ihevcd_nal_search_start_code(UWORD8 *pu1_buf, WORD32 bytes_remaining)
}
zero_byte_cnt++;
if((pu1_buf[ofst + 1] == START_CODE_PREFIX_BYTE) &&
if((ofst < (bytes_remaining - 1)) &&
(pu1_buf[ofst + 1] == START_CODE_PREFIX_BYTE) &&
(zero_byte_cnt >= NUM_ZEROS_BEFORE_START_CODE))
{
/* Found the start code */
@ -123,7 +124,7 @@ WORD32 ihevcd_nal_search_start_code(UWORD8 *pu1_buf, WORD32 bytes_remaining)
break;
}
}
if(0 == start_code_found)
if((0 == start_code_found) && (ofst < bytes_remaining))
{
if((START_CODE_PREFIX_BYTE == pu1_buf[ofst]) &&
(zero_byte_cnt >= NUM_ZEROS_BEFORE_START_CODE))
@ -231,7 +232,7 @@ IHEVCD_ERROR_T ihevcd_nal_remv_emuln_bytes(UWORD8 *pu1_src,
}
if(0 == start_code_found)
if((0 == start_code_found) && (src_cnt < bytes_remaining))
{
u1_src = pu1_src[src_cnt++];
if(zero_byte_cnt >= NUM_ZEROS_BEFORE_START_CODE)