From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 1DEF647C7B for ; Sun, 15 Oct 2023 23:10:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4403768C958; Mon, 16 Oct 2023 02:10:52 +0300 (EEST) Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3546268C0FD for ; Mon, 16 Oct 2023 02:10:45 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 49BCC40002 for ; Sun, 15 Oct 2023 23:10:43 +0000 (UTC) Date: Mon, 16 Oct 2023 01:10:43 +0200 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20231015231043.GB3543730@pb2> References: <20231005194440.1678-1-michael@niedermayer.cc> <20231005194440.1678-2-michael@niedermayer.cc> <169693706354.6638.15385399284895875487@lain.khirnov.net> MIME-Version: 1.0 In-Reply-To: <169693706354.6638.15385399284895875487@lain.khirnov.net> X-GND-Sasl: michael@niedermayer.cc Subject: Re: [FFmpeg-devel] [PATCH 2/5] avformat/usmdec: do not return 0 when no packet was produced X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: multipart/mixed; boundary="===============1711566394893063678==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============1711566394893063678== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="UrvBM2MrVm6e3rrU" Content-Disposition: inline --UrvBM2MrVm6e3rrU Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 && "Invali= d stream index.\n" failed at libavformat/demux.c:617 > > Fixes: 62498/clusterfuzz-testcase-minimized-ffmpeg_dem_USM_fuzzer-47347= 40995112960 > >=20 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz= /tree/master/projects/ffmpeg > > Signed-off-by: Michael Niedermayer > > --- > > libavformat/usmdec.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > >=20 > > 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, AVIO= Context *pb, > > ret =3D avio_skip(pb, FFMAX(0, chunk_size - (ret - chunk_start))); > > if (ret < 0) > > return ret; > > - return 0; > > + return AVERROR(EAGAIN); >=20 > I believe that should be FFERROR_REDO instead. will use FFERROR_REDO instead. will also apply the rest of the patch thx [...] --=20 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 --UrvBM2MrVm6e3rrU Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEIAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCZSxxbwAKCRBhHseHBAsP q9XxAJ4ufpGOy8/gsryZofvq0fR7S/rstwCggierJaDVrXdOOU/YIwgoxUZ1u9w= =ttHn -----END PGP SIGNATURE----- --UrvBM2MrVm6e3rrU-- --===============1711566394893063678== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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". --===============1711566394893063678==--