RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/format: Stop reading data at EOF during probing 

Issue found by: Сергей Колесников
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 80f6e0378b)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2023-05-10 23:58:31 +02:00
parent d3071db595
commit 76c37f668a
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/format.c
View File

@ -228,6 +228,7 @@ int av_probe_input_buffer2(AVIOContext *pb, ff_const59 AVInputFormat **fmt,
int ret = 0, probe_size, buf_offset = 0; int ret = 0, probe_size, buf_offset = 0;
int score = 0; int score = 0;
int ret2; int ret2;
int eof = 0;
if (!max_probe_size) if (!max_probe_size)
max_probe_size = PROBE_BUF_MAX; max_probe_size = PROBE_BUF_MAX;
@ -251,7 +252,7 @@ int av_probe_input_buffer2(AVIOContext *pb, ff_const59 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, probe_size = FFMIN(probe_size << 1,
FFMAX(max_probe_size, probe_size + 1))) { FFMAX(max_probe_size, probe_size + 1))) {
score = probe_size < max_probe_size ? AVPROBE_SCORE_RETRY : 0; score = probe_size < max_probe_size ? AVPROBE_SCORE_RETRY : 0;
@ -267,6 +268,7 @@ int av_probe_input_buffer2(AVIOContext *pb, ff_const59 AVInputFormat **fmt,
score = 0; score = 0;
ret = 0; /* error was end of file, nothing read */ ret = 0; /* error was end of file, nothing read */
eof = 1;
} }
buf_offset += ret; buf_offset += ret;
if (buf_offset < offset) if (buf_offset < offset)