[FFmpeg-cvslog] avformat/matroskadec: Fix undefined shift in read_sint()

Michael Niedermayer git at videolan.org
Wed Jul 1 14:38:14 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  1 11:59:57 2015 +0200| [2f8c81637c47a70b8e06e1bb9877d6f9c058ee2a] | committer: Michael Niedermayer

avformat/matroskadec: Fix undefined shift in read_sint()

Fixes: asan_heap-oob_17212bc_2243_cov_594210248_h264_TTA.mkv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/matroskadec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 07f4539..9247a75 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -806,7 +806,7 @@ static int ebml_read_sint(AVIOContext *pb, int size, int64_t *num)
 
         /* big-endian ordering; build up number */
         while (n++ < size)
-            *num = (*num << 8) | avio_r8(pb);
+            *num = ((uint64_t)*num << 8) | avio_r8(pb);
     }
 
     return 0;



More information about the ffmpeg-cvslog mailing list