diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-03-27 19:53:53 +0000 |
|---|---|---|
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-03-27 19:53:53 +0000 |
| commit | 9b88c05de92ef5ea6cf4fb851205e1adb7ba3c16 (patch) | |
| tree | 5d6447ade5efa3d9c8450bc076439ae1b291eeee | |
| parent | fbdbdf91bdb82b5f06ebf690322d206213a51f70 (diff) | |
| parent | 96f3a8ba91a83769deb9f59175c30fbef0542c2e (diff) | |
| download | libhevc-9b88c05de92ef5ea6cf4fb851205e1adb7ba3c16.tar.gz | |
[automerger] Add limits check for depth hierarchy sps parameters am: f7287c7993 am: 46dc210bfd am: cd00b5307b am: 96f3a8ba91
Change-Id: Ica2ca13d2d169fdc57fde89f503a005b506a2e6d
| -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 154c335..cfaf1ad 100644 --- a/decoder/ihevcd_parse_headers.c +++ b/decoder/ihevcd_parse_headers.c @@ -1422,9 +1422,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 */ |