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 | ed631bced9bb7aa57cc8110cab56f158529932cd (patch) | |
| tree | ce20f4fc8dcd96767e75cdb89dcdfacc126612c8 | |
| parent | e7950035a8b5add18a4b371b66b6781f18e2e2e1 (diff) | |
| parent | cd00b5307bea4ab006ba226dcd00f3d18c7ad055 (diff) | |
| download | libhevc-ed631bced9bb7aa57cc8110cab56f158529932cd.tar.gz | |
Merge changes from topic "am-492ad0fb-402d-4977-be93-b82e053bee6f" into cw-e-dev
* changes:
[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 4fb4403..a43341c 100644 --- a/decoder/ihevcd_parse_headers.c +++ b/decoder/ihevcd_parse_headers.c @@ -1420,9 +1420,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 */ |