aboutsummaryrefslogtreecommitdiff
path: root/decoder/ihevcd_parse_headers.c
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-03-27 19:53:54 +0000
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-03-27 19:53:54 +0000
commit914006b851b840c5eb9353eb785a611e894d80b9 (patch)
tree0feb7e2c0806eebd05bc510ba2a2bdfa5ebb10dd /decoder/ihevcd_parse_headers.c
parent63ef05c7ce420eb092b4f9adecbe0049368ee7a5 (diff)
parent9b88c05de92ef5ea6cf4fb851205e1adb7ba3c16 (diff)
downloadlibhevc-914006b851b840c5eb9353eb785a611e894d80b9.tar.gz
[automerger] Add limits check for depth hierarchy sps parameters am: f7287c7993 am: 46dc210bfd am: cd00b5307b am: 96f3a8ba91 am: 9b88c05de9
Change-Id: I2884bb46efb8272fc030b597e641e2b1cf3e9d30
Diffstat (limited to 'decoder/ihevcd_parse_headers.c')
-rw-r--r--decoder/ihevcd_parse_headers.c8
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 */