virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

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

Browse Source 
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@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2022-02-08 20:04:25 +01:00
parent 02699490c1
commit b0cac7082d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/demux.c
View File

@@ -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 /* NOTE: A new stream can be added there if no header in file
* (AVFMTCTX_NOHEADER). */ * (AVFMTCTX_NOHEADER). */
ret = read_frame_internal(ic, pkt1); ret = read_frame_internal(ic, pkt1);
if (ret == AVERROR(EAGAIN)) if (ret == AVERROR(EAGAIN)) {
read_size += 100;
continue; continue;
}
if (ret < 0) { if (ret < 0) {
/* EOF or error*/ /* EOF or error*/