diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-04-06 19:17:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-04-06 19:17:27 +0000 |
| commit | 08e9bcd2e8f75965edc5f099d4c35731abbaa8c1 (patch) | |
| tree | be515b844baaa45821e7e30c3e423c97dcf1f015 | |
| parent | de502938ff55764c42d836929197fcd7bb87e764 (diff) | |
| parent | d2eb213a277cccfe88c0efb3bf13e6b18bda8a76 (diff) | |
| download | libhevc-08e9bcd2e8f75965edc5f099d4c35731abbaa8c1.tar.gz | |
Merge changes from topic "am-710d603e-2dfd-4779-8a9e-e8fd1e2198ef" into nyc-dr1-dev
* changes:
[automerger] Return error for invalid sps sub layers parameters am: f4486cdb2f am: 37579e833a am: 38e104d65a am: 247c93b227 am: 3e163fda73
[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
| -rw-r--r-- | decoder/ihevcd_parse_headers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/decoder/ihevcd_parse_headers.c b/decoder/ihevcd_parse_headers.c index fde856c..128b780 100644 --- a/decoder/ihevcd_parse_headers.c +++ b/decoder/ihevcd_parse_headers.c @@ -1335,14 +1335,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; } |