MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libavformat/aviobuf: Forward error from avio_read in ffio_read_size()

Browse Source 
Suggested-by: Andreas Rheinhardt
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2020-10-31 10:29:56 +01:00
parent 441fd1bd7d
commit 66ca6d0fe8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/aviobuf.c
View File

@ -686,9 +686,11 @@ int avio_read(AVIOContext *s, unsigned char *buf, int size)
int ffio_read_size(AVIOContext *s, unsigned char *buf, int size)
{
int ret = avio_read(s, buf, size);
if (ret != size)
return AVERROR_INVALIDDATA;
return ret;
if (ret == size)
return ret;
if (ret < 0 && ret != AVERROR_EOF)
return ret;
return AVERROR_INVALIDDATA;
}
int ffio_read_indirect(AVIOContext *s, unsigned char *buf, int size, const unsigned char **data)