diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-04-20 21:13:43 +0000 |
|---|---|---|
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-04-20 21:13:43 +0000 |
| commit | a9a51a4940e78bd125c275581dc8452b34a48c43 (patch) | |
| tree | 3b50b3f5e6a73f77c1a81ddaafc885e0fbf4b045 | |
| parent | dd9737ba1280196c4f0baf9cf6c1a5f7ec247bbf (diff) | |
| parent | 8151a909f76422d22534207de52cdfdf6a0b96c4 (diff) | |
| download | libhevc-a9a51a4940e78bd125c275581dc8452b34a48c43.tar.gz | |
[automerger] Return error for invalid st/lt sps parameters am: b93923e288 am: 797c104f3b am: 092cd28d04 am: 0e0458c8da am: 400d114e64 am: fa6d5fe71f am: 03831de632 am: 1a661cfc0e am: 8151a909f7
Change-Id: If66401894ec3e28da20fd560582fd97c78d4ec22
| -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 13b0239..1878f30 100644 --- a/common/ihevc_defs.h +++ b/common/ihevc_defs.h @@ -313,7 +313,7 @@ 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 d80bc47..6a02cbd 100644 --- a/decoder/ihevcd_parse_headers.c +++ b/decoder/ihevcd_parse_headers.c @@ -1558,10 +1558,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]); @@ -1571,6 +1573,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++) |