[FFmpeg-cvslog] avcodec/svq3: fix slice size check
Michael Niedermayer
git at videolan.org
Sat Aug 20 23:32:32 EEST 2016
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat Aug 20 22:09:54 2016 +0200| [2624695484cde26baedac10192856ebfd97f2cc7] | committer: Michael Niedermayer
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 at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2624695484cde26baedac10192856ebfd97f2cc7
---
libavcodec/svq3.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index bb4508c..653a6db 100644
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -1040,7 +1040,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;
}
More information about the ffmpeg-cvslog
mailing list