[FFmpeg-cvslog] avformat/flvdec: Treat high ts byte as unsigned

Michael Niedermayer git at videolan.org
Wed Feb 10 22:30:34 EET 2021


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Nov 23 21:42:23 2020 +0100| [f514113cfa9fc44d80086bb2a2b783e8026dc3a9] | committer: Michael Niedermayer

avformat/flvdec: Treat high ts byte as unsigned

Fixes: left shift of 255 by 24 places cannot be represented in type 'int'
Fixes: 27516/clusterfuzz-testcase-minimized-ffmpeg_dem_KUX_fuzzer-5152854660349952

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

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

diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 943c0278e5..30d1fcf4b7 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -1174,7 +1174,7 @@ retry_duration:
             avio_seek(s->pb, fsize - 3 - size, SEEK_SET);
             if (size == avio_rb24(s->pb) + 11) {
                 uint32_t ts = avio_rb24(s->pb);
-                ts         |= avio_r8(s->pb) << 24;
+                ts         |= (unsigned)avio_r8(s->pb) << 24;
                 if (ts)
                     s->duration = ts * (int64_t)AV_TIME_BASE / 1000;
                 else if (fsize >= 8 && fsize - 8 >= size) {



More information about the ffmpeg-cvslog mailing list