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 | dd9737ba1280196c4f0baf9cf6c1a5f7ec247bbf (patch) | |
| tree | 57358b5d386cfa10338640e76ceb1beacaa3e4ae | |
| parent | 152634b8b68bcaea02191d4b2ffd04423b7eb8d8 (diff) | |
| parent | a91aead14b7e0619085947b1854bef52889e42eb (diff) | |
| download | libhevc-dd9737ba1280196c4f0baf9cf6c1a5f7ec247bbf.tar.gz | |
Merge changes from topic "am-710d603e-2dfd-4779-8a9e-e8fd1e2198ef" into oc-dev
* changes:
[automerger] Return error for invalid sps sub layers parameters am: f4486cdb2f am: 37579e833a am: 38e104d65a am: 247c93b227 am: 3e163fda73 am: d2eb213a27 am: 33805721b3 am: c9c55cb311 am: 7f03778448
[automerger] Return error for invalid sps sub layers parameters am: f4486cdb2f am: 37579e833a am: 38e104d65a am: 247c93b227 am: 3e163fda73 am: d2eb213a27 am: 33805721b3 am: c9c55cb311
[automerger] Return error for invalid sps sub layers parameters am: f4486cdb2f am: 37579e833a am: 38e104d65a am: 247c93b227 am: 3e163fda73 am: d2eb213a27 am: 33805721b3
[automerger] Return error for invalid sps sub layers parameters am: f4486cdb2f am: 37579e833a am: 38e104d65a am: 247c93b227 am: 3e163fda73 am: d2eb213a27
[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 465fbea..d80bc47 100644 --- a/decoder/ihevcd_parse_headers.c +++ b/decoder/ihevcd_parse_headers.c @@ -1413,14 +1413,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; } |