diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-03-27 19:53:56 +0000 |
|---|---|---|
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-03-27 19:53:56 +0000 |
| commit | 208dc7fec5d8a308dae0b763cf9c085332a2650d (patch) | |
| tree | 0feb7e2c0806eebd05bc510ba2a2bdfa5ebb10dd | |
| parent | 761268ab1c16fcb79881909e42e1783cfb20b65c (diff) | |
| parent | 914006b851b840c5eb9353eb785a611e894d80b9 (diff) | |
| download | libhevc-208dc7fec5d8a308dae0b763cf9c085332a2650d.tar.gz | |
[automerger] Add limits check for depth hierarchy sps parameters am: f7287c7993 am: 46dc210bfd am: cd00b5307b am: 96f3a8ba91 am: 9b88c05de9 am: 914006b851
Change-Id: Iad4c887ff8789bc65009cddc7da7f54f8754dcef
| -rw-r--r-- | decoder/ihevcd_parse_headers.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/decoder/ihevcd_parse_headers.c b/decoder/ihevcd_parse_headers.c index c9b2fbe..9059a5b 100644 --- a/decoder/ihevcd_parse_headers.c +++ b/decoder/ihevcd_parse_headers.c @@ -1424,9 +1424,17 @@ IHEVCD_ERROR_T ihevcd_parse_sps(codec_t *ps_codec) ps_sps->i1_log2_diff_max_min_pcm_coding_block_size = 0; UEV_PARSE("max_transform_hierarchy_depth_inter", value, ps_bitstrm); + if(value < 0 || value > (ps_sps->i1_log2_ctb_size - ps_sps->i1_log2_min_transform_block_size)) + { + return IHEVCD_INVALID_PARAMETER; + } ps_sps->i1_max_transform_hierarchy_depth_inter = value; UEV_PARSE("max_transform_hierarchy_depth_intra", value, ps_bitstrm); + if(value < 0 || value > (ps_sps->i1_log2_ctb_size - ps_sps->i1_log2_min_transform_block_size)) + { + return IHEVCD_INVALID_PARAMETER; + } ps_sps->i1_max_transform_hierarchy_depth_intra = value; /* String has a d (enabled) in order to match with HM */ |