]> git.sesse.net Git - ffmpeg/commitdiff
avformat/electronicarts: Check for EOF in each iteration of the loop in ea_read_packet()
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 24 Oct 2020 17:24:30 +0000 (19:24 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 25 Oct 2020 08:05:01 +0000 (09:05 +0100)
Fixes: timeout(>20sec -> 1ms)
Fixes: 26526/clusterfuzz-testcase-minimized-ffmpeg_dem_EA_fuzzer-5672328069120000
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/electronicarts.c

index d0f483aaf90eb7c0b06a569b4491b62d603814e0..4c292f29a2b19228f31b52d0690b1a1b14864d99 100644 (file)
@@ -582,6 +582,8 @@ static int ea_read_packet(AVFormatContext *s, AVPacket *pkt)
     int av_uninit(num_samples);
 
     while ((!packet_read && !hit_end) || partial_packet) {
+        if (avio_feof(pb))
+            return AVERROR_EOF;
         chunk_type = avio_rl32(pb);
         chunk_size = ea->big_endian ? avio_rb32(pb) : avio_rl32(pb);
         if (chunk_size < 8)