[FFmpeg-cvslog] avformat/electronicarts: Check for EOF in each iteration of the loop in ea_read_packet()

Michael Niedermayer git at videolan.org
Sun Oct 25 11:03:44 EET 2020


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat Oct 24 19:24:30 2020 +0200| [857aba7c45faf0335ad91ecabc0bce8b94320758] | committer: Michael Niedermayer

avformat/electronicarts: Check for EOF in each iteration of the loop in ea_read_packet()

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 at xvid.org>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavformat/electronicarts.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c
index d0f483aaf9..4c292f29a2 100644
--- a/libavformat/electronicarts.c
+++ b/libavformat/electronicarts.c
@@ -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)



More information about the ffmpeg-cvslog mailing list