]> git.sesse.net Git - ffmpeg/commitdiff
avformat/flvdec: Treat high ts byte as unsigned
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 23 Nov 2020 20:42:23 +0000 (21:42 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 10 Feb 2021 20:18:16 +0000 (21:18 +0100)
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@niedermayer.cc>
libavformat/flvdec.c

index 943c0278e5b94008ac08b405f58783bc706835f5..30d1fcf4b766a2a315cd758dd90c8c5e193159cb 100644 (file)
@@ -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) {