[FFmpeg-devel] [PATCH 1/2] libavformat/aviobuf: Forward error from avio_read in ffio_read_size()

[Michael Niedermayer]

On Sat, Oct 31, 2020 at 03:18:26PM +0100, Andreas Rheinhardt wrote:
> Michael Niedermayer:
> > Suggested-by: Andreas Rheinhardt
> > Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> > ---
> >  libavformat/aviobuf.c | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
> > index 80a5a565a4..3cc440e4e7 100644
> > --- a/libavformat/aviobuf.c
> > +++ b/libavformat/aviobuf.c
> > @@ -686,6 +686,8 @@ 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 < 0 && ret != AVERROR_EOF)
> > +        return ret;
> >      if (ret != size)
> >          return AVERROR_INVALIDDATA;
> >      return ret;
> > 
> Maybe first check for ret == size. After all, that is supposed to be the
> common case.

ok, will do

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Dictatorship naturally arises out of democracy, and the most aggravated
form of tyranny and slavery out of the most extreme liberty. -- Plato
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20201104/adc1777f/attachment.sig>