diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-04-20 21:13:32 +0000 |
|---|---|---|
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-04-20 21:13:32 +0000 |
| commit | 797c104f3b24f4d184ce367af15094c0884ad644 (patch) | |
| tree | 6c782253adcd8979a2a98a91401df79ab7558401 | |
| parent | 3bc5ebb996443e852d302e8e9889aca2b9839fa7 (diff) | |
| parent | b93923e2883a2d1a4eb46290c3b15a84da808d66 (diff) | |
| download | libhevc-797c104f3b24f4d184ce367af15094c0884ad644.tar.gz | |
[automerger] Return error for invalid st/lt sps parameters am: b93923e288
Change-Id: I6b15a4359ef9228c6f707f4e104c587d189c6bfc
| -rw-r--r-- | common/ihevc_defs.h | 2 | ||||
| -rw-r--r-- | decoder/ihevcd_parse_headers.c | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/common/ihevc_defs.h b/common/ihevc_defs.h index 946687f..5360ff2 100644 --- a/common/ihevc_defs.h +++ b/common/ihevc_defs.h @@ -274,7 +274,7 @@ typedef enum { #define SPS_MAX_SUB_LAYERS 7 /* Maximum long term reference pics */ -#define MAX_LTREF_PICS_SPS 16 +#define MAX_LTREF_PICS_SPS 32 #define MAX_STREF_PICS_SPS 64 diff --git a/decoder/ihevcd_parse_headers.c b/decoder/ihevcd_parse_headers.c index ce0e3f8..22836a0 100644 --- a/decoder/ihevcd_parse_headers.c +++ b/decoder/ihevcd_parse_headers.c @@ -1478,10 +1478,12 @@ IHEVCD_ERROR_T ihevcd_parse_sps(codec_t *ps_codec) } UEV_PARSE("num_short_term_ref_pic_sets", value, ps_bitstrm); + if(value < 0 || value > MAX_STREF_PICS_SPS) + { + return IHEVCD_INVALID_PARAMETER; + } ps_sps->i1_num_short_term_ref_pic_sets = value; - ps_sps->i1_num_short_term_ref_pic_sets = CLIP3(ps_sps->i1_num_short_term_ref_pic_sets, 0, MAX_STREF_PICS_SPS); - for(i = 0; i < ps_sps->i1_num_short_term_ref_pic_sets; i++) ihevcd_short_term_ref_pic_set(ps_bitstrm, &ps_sps->as_stref_picset[0], ps_sps->i1_num_short_term_ref_pic_sets, i, &ps_sps->as_stref_picset[i]); @@ -1491,6 +1493,10 @@ IHEVCD_ERROR_T ihevcd_parse_sps(codec_t *ps_codec) if(ps_sps->i1_long_term_ref_pics_present_flag) { UEV_PARSE("num_long_term_ref_pics_sps", value, ps_bitstrm); + if(value < 0 || value > MAX_LTREF_PICS_SPS) + { + return IHEVCD_INVALID_PARAMETER; + } ps_sps->i1_num_long_term_ref_pics_sps = value; for(i = 0; i < ps_sps->i1_num_long_term_ref_pics_sps; i++) |