[FFmpeg-cvslog] avcodec/rv10: Avoid calculating undefined value that is unused

Michael Niedermayer git at videolan.org
Wed Jun 26 23:15:50 EEST 2019


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Jun 16 12:52:30 2019 +0200| [d57f6606ebe166a428d939228d0d6490e3255ae1] | committer: Michael Niedermayer

avcodec/rv10: Avoid calculating undefined value that is unused

Fixes: shift exponent 64 is too large for 32-bit type 'int'
Fixes: 15253/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RV10_fuzzer-5671114300194816

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d57f6606ebe166a428d939228d0d6490e3255ae1
---

 libavcodec/rv10.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index 595e217519..8f4497b9e0 100644
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -646,7 +646,7 @@ static int rv10_decode_packet(AVCodecContext *avctx, const uint8_t *buf,
 
         // Repeat the slice end check from ff_h263_decode_mb with our active
         // bitstream size
-        if (ret != SLICE_ERROR) {
+        if (ret != SLICE_ERROR && active_bits_size >= get_bits_count(&s->gb)) {
             int v = show_bits(&s->gb, 16);
 
             if (get_bits_count(&s->gb) + 16 > active_bits_size)



More information about the ffmpeg-cvslog mailing list