aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-13 01:31:15 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-01 23:25:20 +0200
commit959423e8d7afec74aad92d3927b6ce6006b7b82e (patch)
treeb7e08b150c54a6975a57afe661a6f571e3fffce3
parent96de4bbf38c29e35c7175fc2d23fc9aa1bec8952 (diff)
downloadffmpeg-959423e8d7afec74aad92d3927b6ce6006b7b82e.tar.gz
avcodec/hevc_sei: Check num_sps_ids_minus1 value
Fixes CID1271794 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 93b0ee21a2f534f6d3b812686f3acde110e94f18) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/hevc_sei.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c
index 5bb5c9010a..13ebcd3ede 100644
--- a/libavcodec/hevc_sei.c
+++ b/libavcodec/hevc_sei.c
@@ -126,6 +126,11 @@ static int active_parameter_sets(HEVCContext *s)
get_bits(gb, 1); // num_sps_ids_minus1
num_sps_ids_minus1 = get_ue_golomb_long(gb); // num_sps_ids_minus1
+ if (num_sps_ids_minus1 < 0 || num_sps_ids_minus1 > 15) {
+ av_log(s->avctx, AV_LOG_ERROR, "num_sps_ids_minus1 %d invalid\n", num_sps_ids_minus1);
+ return AVERROR_INVALIDDATA;
+ }
+
active_seq_parameter_set_id = get_ue_golomb_long(gb);
if (active_seq_parameter_set_id >= MAX_SPS_COUNT) {
av_log(s->avctx, AV_LOG_ERROR, "active_parameter_set_id %d invalid\n", active_seq_parameter_set_id);