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

* changes:
  [automerger] Add bounds check for tile dimensions am: 05f83e9458 am: 8ee7982e46 am: 7c6da2165b am: c11699b0f4 am: c0d441f4a7
  [automerger] Add bounds check for tile dimensions am: 05f83e9458 am: 8ee7982e46 am: 7c6da2165b am: c11699b0f4
  [automerger] Add bounds check for tile dimensions am: 05f83e9458 am: 8ee7982e46 am: 7c6da2165b
  [automerger] Add bounds check for tile dimensions am: 05f83e9458 am: 8ee7982e46
  [automerger] Add bounds check for tile dimensions am: 05f83e9458
  Add bounds check for tile dimensions
This commit is contained in:
TreeHugger Robot 2019-05-07 00:16:35 +00:00 committed by Android (Google) Code Review
commit dce2f1a1a1

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
{