Re: [FFmpeg-devel] [PATCH 2/5] avformat/usmdec: do not return 0 when no packet was produced

From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: Re: [FFmpeg-devel] [PATCH 2/5] avformat/usmdec: do not return 0 when no packet was produced
Date: Mon, 16 Oct 2023 01:10:43 +0200
Message-ID: <20231015231043.GB3543730@pb2> (raw)
In-Reply-To: <169693706354.6638.15385399284895875487@lain.khirnov.net>

[-- Attachment #1.1: Type: text/plain, Size: 1410 bytes --]

On Tue, Oct 10, 2023 at 01:24:23PM +0200, Anton Khirnov wrote:
> Quoting Michael Niedermayer (2023-10-05 21:44:37)
> > Fixes: Assertion pkt->stream_index < (unsigned)s->nb_streams && "Invalid stream index.\n" failed at libavformat/demux.c:617
> > Fixes: 62498/clusterfuzz-testcase-minimized-ffmpeg_dem_USM_fuzzer-4734740995112960
> > 
> > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  libavformat/usmdec.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/libavformat/usmdec.c b/libavformat/usmdec.c
> > index 1665eb8e551..b0079a1230c 100644
> > --- a/libavformat/usmdec.c
> > +++ b/libavformat/usmdec.c
> > @@ -361,7 +361,7 @@ static int64_t parse_chunk(AVFormatContext *s, AVIOContext *pb,
> >      ret = avio_skip(pb, FFMAX(0, chunk_size - (ret - chunk_start)));
> >      if (ret < 0)
> >          return ret;
> > -    return 0;
> > +    return AVERROR(EAGAIN);
> 
> I believe that should be FFERROR_REDO instead.

will use FFERROR_REDO instead.
will also apply the rest of the patch

thx

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

Does the universe only have a finite lifespan? No, its going to go on
forever, its just that you wont like living in it. -- Hiranya Peiri

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".