From 05f83e945884735a665555d171dec4cfdefa3956 Mon Sep 17 00:00:00 2001 From: Harish Mahendrakar Date: Fri, 5 Apr 2019 12:54:40 -0700 Subject: [PATCH] Add bounds check for tile dimensions Bug: 129976164 Bug: 130024844 Test: vendor/poc Change-Id: I1e54babaec9c5ad199b60c7cfc1e24e36422f630 --- decoder/ihevcd_parse_headers.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/decoder/ihevcd_parse_headers.c b/decoder/ihevcd_parse_headers.c index 61cd245..bfe9e06 100644 --- a/decoder/ihevcd_parse_headers.c +++ b/decoder/ihevcd_parse_headers.c @@ -1908,6 +1908,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 { @@ -1944,6 +1948,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 {