aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-06-17 00:34:08 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-08-23 13:15:18 +0200
commit6a5ade5608df72b1ab1c1567368dd9f399b6c46a (patch)
tree58e592c1bc58ef061c3a0b14e580ae81154c6073 /libavcodec
parent8fa71d7b59df98a454eef247d68ba5e4051c808c (diff)
downloadffmpeg-6a5ade5608df72b1ab1c1567368dd9f399b6c46a.tar.gz
avcodec/hevcdec: Fix signed integer overflow in decode_lt_rps()
Fixes: runtime error: signed integer overflow: 2147483647 + 6 cannot be represented in type 'int' Fixes: 2263/clusterfuzz-testcase-minimized-4800359627227136 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 1edbf5e20c75f06d6987bc823e63aa4e649ccddd) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/hevc.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index acdfcdb8f1..6925f3da54 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -265,12 +265,16 @@ static int decode_lt_rps(HEVCContext *s, LongTermRPS *rps, GetBitContext *gb)
delta_poc_msb_present = get_bits1(gb);
if (delta_poc_msb_present) {
- int delta = get_ue_golomb_long(gb);
+ int64_t delta = get_ue_golomb_long(gb);
+ int64_t poc;
if (i && i != nb_sps)
delta += prev_delta_msb;
- rps->poc[i] += s->poc - delta * max_poc_lsb - s->sh.pic_order_cnt_lsb;
+ poc = rps->poc[i] + s->poc - delta * max_poc_lsb - s->sh.pic_order_cnt_lsb;
+ if (poc != (int32_t)poc)
+ return AVERROR_INVALIDDATA;
+ rps->poc[i] = poc;
prev_delta_msb = delta;
}
}