mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-25 16:52:31 +00:00
avformat/format: Stop reading data at EOF during probing
Issue found by: Сергей Колесников Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
b5c07a368b
commit
80f6e0378b
@ -257,6 +257,7 @@ int av_probe_input_buffer2(AVIOContext *pb, const 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;
|
||||||
@ -280,7 +281,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,
|
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;
|
||||||
@ -296,6 +297,7 @@ int av_probe_input_buffer2(AVIOContext *pb, const 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)
|
||||||
|
Loading…
Reference in New Issue
Block a user