[FFmpeg-cvslog] avformat/demux: Count EAGAIN as 100 bytes in relation to read limit in avformat_find_stream_info()

Michael Niedermayer git at videolan.org
Fri Jun 17 02:55:04 EEST 2022


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue Feb  8 20:04:25 2022 +0100| [b0cac7082d8a3ff2d4f039af01b45c48bb578de7] | committer: Michael Niedermayer

avformat/demux: Count EAGAIN as 100 bytes in relation to read limit in avformat_find_stream_info()

Fixes: Timeout
Fixes: 43717/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-5206008287330304
Fixes: 45738/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-6142535657979904

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavformat/demux.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavformat/demux.c b/libavformat/demux.c
index 57720f4311..e121253dfd 100644
--- a/libavformat/demux.c
+++ b/libavformat/demux.c
@@ -2615,8 +2615,10 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
         /* NOTE: A new stream can be added there if no header in file
          * (AVFMTCTX_NOHEADER). */
         ret = read_frame_internal(ic, pkt1);
-        if (ret == AVERROR(EAGAIN))
+        if (ret == AVERROR(EAGAIN)) {
+            read_size += 100;
             continue;
+        }
 
         if (ret < 0) {
             /* EOF or error*/



More information about the ffmpeg-cvslog mailing list