Commit c7f625ee authored by Måns Rullgård's avatar Måns Rullgård

Fix erroneous behaviour when format probe hits end of file

If the format probe hits end of file, do not add the error code
to the buffer position.  This is obviously wrong, and with a
small input file would cause a negative buffer overflow.

Fixes issue 1818.

Originally committed as revision 22571 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 3bd74e92
...@@ -495,6 +495,7 @@ int ff_probe_input_buffer(ByteIOContext **pb, AVInputFormat **fmt, ...@@ -495,6 +495,7 @@ int ff_probe_input_buffer(ByteIOContext **pb, AVInputFormat **fmt,
return ret; return ret;
} }
score = 0; score = 0;
ret = 0; /* error was end of file, nothing read */
} }
pd.buf_size += ret; pd.buf_size += ret;
pd.buf = &buf[offset]; pd.buf = &buf[offset];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment