aboutsummaryrefslogtreecommitdiff
path: root/decoder
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-04-06 19:17:27 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-04-06 19:17:27 +0000
commit91adc13b0e592ca91fe6e3a3d9a743f40be88efb (patch)
tree13431b23dd45090c37d8b0922208488e06f30c71 /decoder
parentb6584f925dc57a56df6400a64fac532ac9c76cd0 (diff)
parent3e163fda73cfd74670ca39b47cd9e3189866b8d5 (diff)
downloadlibhevc-91adc13b0e592ca91fe6e3a3d9a743f40be88efb.tar.gz
Merge changes from topic "am-710d603e-2dfd-4779-8a9e-e8fd1e2198ef" into nyc-dev
* changes: [automerger] Return error for invalid sps sub layers parameters am: f4486cdb2f am: 37579e833a am: 38e104d65a am: 247c93b227 [automerger] Return error for invalid sps sub layers parameters am: f4486cdb2f am: 37579e833a am: 38e104d65a [automerger] Return error for invalid sps sub layers parameters am: f4486cdb2f am: 37579e833a [automerger] Return error for invalid sps sub layers parameters am: f4486cdb2f Return error for invalid sps sub layers parameters
Diffstat (limited to 'decoder')
-rw-r--r--decoder/ihevcd_parse_headers.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/decoder/ihevcd_parse_headers.c b/decoder/ihevcd_parse_headers.c
index a43341c..ce0e3f8 100644
--- a/decoder/ihevcd_parse_headers.c
+++ b/decoder/ihevcd_parse_headers.c
@@ -1333,14 +1333,14 @@ IHEVCD_ERROR_T ihevcd_parse_sps(codec_t *ps_codec)
for(; i < ps_sps->i1_sps_max_sub_layers; i++)
{
UEV_PARSE("max_dec_pic_buffering", value, ps_bitstrm);
- if((value + 1) > MAX_DPB_SIZE)
+ if(value < 0 || (value + 1) > MAX_DPB_SIZE)
{
return IHEVCD_INVALID_PARAMETER;
}
ps_sps->ai1_sps_max_dec_pic_buffering[i] = value + 1;
UEV_PARSE("num_reorder_pics", value, ps_bitstrm);
- if(value > ps_sps->ai1_sps_max_dec_pic_buffering[i])
+ if(value < 0 || value > ps_sps->ai1_sps_max_dec_pic_buffering[i])
{
return IHEVCD_INVALID_PARAMETER;
}