Merge changes from topic "am-5b50c796-9c7d-4769-bc6c-f71bdac7c742" into oc-dev

am: dce2f1a1a1

Change-Id: Id9a8e3b00bfc8b7bf115d249525bf686ebc1f482
This commit is contained in:
Harish Mahendrakar 2019-05-06 17:57:43 -07:00 committed by android-build-merger
commit 7dd0807cdf

View file

@ -2001,6 +2001,10 @@ IHEVCD_ERROR_T ihevcd_parse_pps(codec_t *ps_codec)
{
UEV_PARSE("column_width_minus1[ i ]", value, ps_bitstrm);
value += 1;
if (value >= ps_sps->i2_pic_wd_in_ctb - start)
{
return IHEVCD_INVALID_HEADER;
}
}
else
{
@ -2037,6 +2041,10 @@ IHEVCD_ERROR_T ihevcd_parse_pps(codec_t *ps_codec)
UEV_PARSE("row_height_minus1[ i ]", value, ps_bitstrm);
value += 1;
if (value >= ps_sps->i2_pic_ht_in_ctb - start)
{
return IHEVCD_INVALID_HEADER;
}
}
else
{