diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-20 22:09:54 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-25 03:29:36 +0200 |
commit | 8c4a67183b0790735cc4611015a3a66c2616f6f1 (patch) | |
tree | 23bec0f3c6288fea3e430ed6be2b17ad16df14f7 | |
parent | 049d7677156af30ea34f5871df88846a8b9bc385 (diff) | |
download | ffmpeg-8c4a67183b0790735cc4611015a3a66c2616f6f1.tar.gz |
avcodec/svq3: fix slice size check
Fixes out of array read
Fixes: 09f46aa2175cade93e3e3932646a56a9/asan_heap-oob_4a5385_2995_498f6abfdc0248288cefe5f4b7ad316c.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 2624695484cde26baedac10192856ebfd97f2cc7)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r-- | libavcodec/svq3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index a927063f9f..5e7d1643ad 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -1027,7 +1027,7 @@ static int svq3_decode_slice_header(AVCodecContext *avctx) slice_bits = slice_length * 8; slice_bytes = slice_length + length - 1; - if (slice_bytes > get_bits_left(&s->gb)) { + if (8LL*slice_bytes > get_bits_left(&s->gb)) { av_log(avctx, AV_LOG_ERROR, "slice after bitstream end\n"); return -1; } |