Merge "Check for buffer overflow in pps/slice header parsing" into lmp-dev am: 1853d3871a am: f7635dd278 am: 17caa64f8b am: 0b13008b9a am: 76c466f238 am: 94f311a6f2 am: d33b4bb164

am: 22dfbd2def

Change-Id: I8a18c0e8649d25ac409b5904683cf89c67a310c2
This commit is contained in:
Naveen Kumar P 2017-05-16 22:39:51 +00:00 committed by android-build-merger
commit 81f389ea8c
2 changed files with 6 additions and 0 deletions

View file

@ -1962,6 +1962,9 @@ IHEVCD_ERROR_T ihevcd_parse_pps(codec_t *ps_codec)
/* Not present in HM */
BITS_PARSE("pps_extension_flag", value, ps_bitstrm, 1);
if((UWORD8 *)ps_bitstrm->pu4_buf > ps_bitstrm->pu1_buf_max)
return IHEVCD_INVALID_PARAMETER;
ps_codec->i4_pps_done = 1;
return ret;
}

View file

@ -862,6 +862,9 @@ IHEVCD_ERROR_T ihevcd_parse_slice_header(codec_t *ps_codec,
ihevcd_bits_flush_to_byte_boundary(ps_bitstrm);
if((UWORD8 *)ps_bitstrm->pu4_buf > ps_bitstrm->pu1_buf_max)
return IHEVCD_INVALID_PARAMETER;
{
dpb_mgr_t *ps_dpb_mgr = (dpb_mgr_t *)ps_codec->pv_dpb_mgr;
WORD32 r_idx;