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 36B7A4A4CC for ; Tue, 30 Apr 2024 22:53:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 200EE68D62A; Wed, 1 May 2024 01:53:23 +0300 (EEST) Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B908B68D417 for ; Wed, 1 May 2024 01:53:16 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 196E5E0005 for ; Tue, 30 Apr 2024 22:53:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1714517596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=JL9e2ud+Qe5BDQG2kC/78K0lfkPo61Ii6EJYiTxXJvY=; b=YxkBkx9xoeBazQ0gcrJpogi2MMBFzEqoIZzixs+hP5r4F32mRnhtDfCoc8KxDRgf5gpYz7 MoNsUbMC0Q/bu/2sxI+ZwVbI0Wx5XKDltExvABLqs0lSsxiqPKDgRb1KxbDJLMGy2t0aYE X5JaMZrkZH/h17R0rqRhelzNhJu79Ay2S0f3fgob/u45lMIqZvSCp3mOnNfxfjBslRMSYU pMQ7iUeXNe4JMj1knPlkXx8OAax0nvmbH8rnGCHkNRRIkiJ9ThlLR3TXFuKR5cnatfr3Rq vBbNp4PsJSA/7KoyyUt9nAOvM3/HyDOb5N4ruh9DiBV3KlYRRXhFPDBV0Jg77g== Date: Wed, 1 May 2024 00:53:15 +0200 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20240430225315.GV6420@pb2> References: <20240428213052.3800493-1-michael@niedermayer.cc> <20240428213052.3800493-5-michael@niedermayer.cc> MIME-Version: 1.0 In-Reply-To: X-GND-Sasl: michael@niedermayer.cc Subject: Re: [FFmpeg-devel] [PATCH 5/5] avcodec/atrac9dec: Check init_get_bits8() for failure 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="===============4384757627202756485==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============4384757627202756485== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="dj7p0wgK2Qb8Gbgm" Content-Disposition: inline --dj7p0wgK2Qb8Gbgm Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Apr 28, 2024 at 11:41:48PM +0200, Lynne wrote: > Apr 28, 2024, 23:31 by michael@niedermayer.cc: >=20 > > Fixes: CID1439569 Unchecked return value > > Fixes: CID1439578 Unchecked return value > > > > Sponsored-by: Sovereign Tech Fund > > Signed-off-by: Michael Niedermayer > > --- > > libavcodec/atrac9dec.c | 8 ++++++-- > > 1 file changed, 6 insertions(+), 2 deletions(-) > > > > diff --git a/libavcodec/atrac9dec.c b/libavcodec/atrac9dec.c > > index df68407af92..e375f46fd04 100644 > > --- a/libavcodec/atrac9dec.c > > +++ b/libavcodec/atrac9dec.c > > @@ -802,7 +802,9 @@ static int atrac9_decode_frame(AVCodecContext *avct= x, AVFrame *frame, > > if (ret < 0) > > return ret; > > =20 > > - init_get_bits8(&gb, avpkt->data, avpkt->size); > > + ret =3D init_get_bits8(&gb, avpkt->data, avpkt->size); > > + if (ret < 0) > > + return ret; > > =20 > > for (int i =3D 0; i < frames; i++) { > > for (int j =3D 0; j < s->block_config->count; j++) { > > @@ -922,7 +924,9 @@ static av_cold int atrac9_decode_init(AVCodecContex= t *avctx) > > return AVERROR_INVALIDDATA; > > } > > =20 > > - init_get_bits8(&gb, avctx->extradata + 4, avctx->extradata_size); > > + err =3D init_get_bits8(&gb, avctx->extradata + 4, avctx->extradata= _size); > > + if (err < 0) > > + return err; > > =20 > > if (get_bits(&gb, 8) !=3D 0xFE) { > > av_log(avctx, AV_LOG_ERROR, "Incorrect magic byte!\n"); > > >=20 > This and ac3 lgtm will apply thx [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB When you are offended at any man's fault, turn to yourself and study your own failings. Then you will forget your anger. -- Epictetus --dj7p0wgK2Qb8Gbgm Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEKAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCZjF2VAAKCRBhHseHBAsP q9CyAJ9EsA7Dl/3ZxjDciv9ItvUk6NgtUACgmrpjyHtHSAXUB9KNIdWG7a7kEAc= =tcLZ -----END PGP SIGNATURE----- --dj7p0wgK2Qb8Gbgm-- --===============4384757627202756485== 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". --===============4384757627202756485==--