generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/utils/av_probe_input_buffer2: fix offset check

Browse Source 
The check could fail if avio_read() read less than requested

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8c3b026a0e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-01-13 22:17:12 +01:00
parent 82b44665e9
commit 3994eebb1e
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/utils.c
View File

@@ -461,9 +461,6 @@ int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
probe_size = FFMIN(probe_size<<1, FFMAX(max_probe_size, probe_size+1))) { probe_size = FFMIN(probe_size<<1, FFMAX(max_probe_size, probe_size+1))) {
void *buftmp; void *buftmp;
if (probe_size < offset) {
continue;
}
score = probe_size < max_probe_size ? AVPROBE_SCORE_RETRY : 0; score = probe_size < max_probe_size ? AVPROBE_SCORE_RETRY : 0;
/* read probe data */ /* read probe data */
@@ -483,6 +480,8 @@ int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
ret = 0; /* error was end of file, nothing read */ ret = 0; /* error was end of file, nothing read */
} }
buf_offset += ret; buf_offset += ret;
if (buf_offset < offset)
continue;
pd.buf_size = buf_offset - offset; pd.buf_size = buf_offset - offset;
pd.buf = &buf[offset]; pd.buf = &buf[offset];