[FFmpeg-cvslog] avformat/format: Stop reading data at EOF during probing
Michael Niedermayer
git at videolan.org
Mon Oct 30 02:10:47 EET 2023
ffmpeg | branch: release/5.1 | Michael Niedermayer <michael at niedermayer.cc> | Wed May 10 23:58:31 2023 +0200| [ee90868c67782fb0a79d51376aa05b045f6805f8] | committer: Michael Niedermayer
avformat/format: Stop reading data at EOF during probing
Issue found by: Сергей Колесников
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 80f6e0378beae69d31f24b036a1365405dea61d1)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ee90868c67782fb0a79d51376aa05b045f6805f8
---
libavformat/format.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavformat/format.c b/libavformat/format.c
index 4b1f3c2986..4fb62eaffb 100644
--- a/libavformat/format.c
+++ b/libavformat/format.c
@@ -233,6 +233,7 @@ int av_probe_input_buffer2(AVIOContext *pb, const AVInputFormat **fmt,
int ret = 0, probe_size, buf_offset = 0;
int score = 0;
int ret2;
+ int eof = 0;
if (!max_probe_size)
max_probe_size = PROBE_BUF_MAX;
@@ -256,7 +257,7 @@ int av_probe_input_buffer2(AVIOContext *pb, const AVInputFormat **fmt,
}
}
- for (probe_size = PROBE_BUF_MIN; probe_size <= max_probe_size && !*fmt;
+ for (probe_size = PROBE_BUF_MIN; probe_size <= max_probe_size && !*fmt && !eof;
probe_size = FFMIN(probe_size << 1,
FFMAX(max_probe_size, probe_size + 1))) {
score = probe_size < max_probe_size ? AVPROBE_SCORE_RETRY : 0;
@@ -272,6 +273,7 @@ int av_probe_input_buffer2(AVIOContext *pb, const AVInputFormat **fmt,
score = 0;
ret = 0; /* error was end of file, nothing read */
+ eof = 1;
}
buf_offset += ret;
if (buf_offset < offset)
More information about the ffmpeg-cvslog
mailing list