diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-04-06 19:08:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-04-06 19:08:18 +0000 |
| commit | de502938ff55764c42d836929197fcd7bb87e764 (patch) | |
| tree | 7489f6a9e97b58fc994e1523fac2077322aec9c8 | |
| parent | a5af46e7c439e29f5faa53a5b74b7625d01025b8 (diff) | |
| parent | 914006b851b840c5eb9353eb785a611e894d80b9 (diff) | |
| download | libhevc-de502938ff55764c42d836929197fcd7bb87e764.tar.gz | |
Merge changes from topic "am-492ad0fb-402d-4977-be93-b82e053bee6f" into nyc-dr1-dev
* changes:
[automerger] Add limits check for depth hierarchy sps parameters am: f7287c7993 am: 46dc210bfd am: cd00b5307b am: 96f3a8ba91 am: 9b88c05de9
[automerger] Add limits check for depth hierarchy sps parameters am: f7287c7993 am: 46dc210bfd am: cd00b5307b am: 96f3a8ba91
[automerger] Add limits check for depth hierarchy sps parameters am: f7287c7993 am: 46dc210bfd am: cd00b5307b
[automerger] Add limits check for depth hierarchy sps parameters am: f7287c7993 am: 46dc210bfd
[automerger] Add limits check for depth hierarchy sps parameters am: f7287c7993
Add limits check for depth hierarchy sps parameters
| -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 043386f..fde856c 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 */ |