diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-06-17 00:34:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-06-17 02:25:56 +0200 |
| commit | 1ce850f96da266df58a5c5235c0ff1a5e32814dc (patch) | |
| tree | 39a38865db28c33a1ca5326bf5f62f1fd3579f62 | |
| parent | c436af15596a4c3c4d43a9928f32837c913b25bc (diff) | |
| download | ffmpeg-1ce850f96da266df58a5c5235c0ff1a5e32814dc.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>
| -rw-r--r-- | libavcodec/hevc.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index a9f11006bb..6dcc1c8aa4 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -269,12 +269,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; } } |