From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id EA6E44FB93 for ; Sat, 28 Jun 2025 01:42:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id EE18C68E228; Sat, 28 Jun 2025 04:42:51 +0300 (EEST) Received: from sender2-op-o10.zoho.eu (sender2-op-o10.zoho.eu [136.143.171.10]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 199A4687D70 for ; Sat, 28 Jun 2025 04:42:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; t=1751074961; cv=none; d=zohomail.eu; s=zohoarc; b=gijP0oFYvzGD3+gmWrcPwsFVr2BpLQqEsuzel4kTiZuxfJlW+ClhED8ioro9xnhqXQkhlAduoqk5fwK/E+dfSlvcy4ZdhBWDUb/s8fDd94l+FuISKxXEzhVVdur5hqZ/SnAsVB75OLr0RHyW10lQ8rJPZwoMxrIYCMsAOVHQzXA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.eu; s=zohoarc; t=1751074961; h=Content-Type:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=YC4zVPW/+C2X3KOdHpvobSGUHB/1oLJAvuPe1dhxUjw=; b=gjFn0MprFs7ekY+8RdXIgSgd4pxr8eHOvIWkQgLkURafEdOP6AZ9Po7Fam2BbK7/EVjcOHNa3gg2iSiFZpA/drj5ecc2LIOfH55kJX4tbezkAXe/sotrsQV/ZpOtDq1sZoG5E4HTPN09bTYGfz/KYNkgTGzSbDG8l/wJirQ2DQk= ARC-Authentication-Results: i=1; mx.zohomail.eu; dkim=pass header.i=frankplowman.com; spf=pass smtp.mailfrom=post@frankplowman.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1751074961; s=zmail; d=frankplowman.com; i=post@frankplowman.com; h=Message-ID:Date:Date:MIME-Version:Subject:Subject:To:To:References:From:From:In-Reply-To:Content-Type:Message-Id:Reply-To:Cc; bh=YC4zVPW/+C2X3KOdHpvobSGUHB/1oLJAvuPe1dhxUjw=; b=N+yAbMl4AJ1PZ7bcd4QWs/g3K6Iv/XoyjgdpGVD1XuWJzGrj/NRd8CYkZ5MiXJmD V5wd+uy80+Nn1HVnh7bbFqVeHXqqs9SheGxi1l9EREl7dB2Dg0oiddI3+QiYfH2qW37 g2IoESfbWXlVLEfyePIBmeplCESJ6A/OWUX2X7NY= Received: by mx.zoho.eu with SMTPS id 1751074958794746.0078821790189; Sat, 28 Jun 2025 03:42:38 +0200 (CEST) Message-ID: Date: Sat, 28 Jun 2025 10:42:34 +0900 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-GB To: ffmpeg-devel@ffmpeg.org References: <0ba7d6fa-7b81-41b7-ba54-711c4c4bdac2@frankplowman.com> <20250626232350.42335-1-epirat07@gmail.com> From: Frank Plowman In-Reply-To: <20250626232350.42335-1-epirat07@gmail.com> X-Zoho-Virus-Status: 1 X-Zoho-Virus-Status: 1 X-Zoho-AV-Stamp: zmail-av-1.4.2/251.62.80 X-ZohoMailClient: External Subject: Re: [FFmpeg-devel] [PATCH v2] avcodec/vvc/refs: remove early return 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="===============1435232473572591902==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --===============1435232473572591902== Content-Language: en-GB Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------IooMbFkoh86QF8gVF6kQw9iH" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------IooMbFkoh86QF8gVF6kQw9iH Content-Type: multipart/mixed; boundary="------------BfGD0NiuMgFswk7c40T1m1R0"; protected-headers="v1" From: Frank Plowman To: ffmpeg-devel@ffmpeg.org Message-ID: Subject: Re: [FFmpeg-devel] [PATCH v2] avcodec/vvc/refs: remove early return References: <0ba7d6fa-7b81-41b7-ba54-711c4c4bdac2@frankplowman.com> <20250626232350.42335-1-epirat07@gmail.com> In-Reply-To: <20250626232350.42335-1-epirat07@gmail.com> --------------BfGD0NiuMgFswk7c40T1m1R0 Content-Type: multipart/mixed; boundary="------------83CTa4UJmsHemFVPr0zKsewj" --------------83CTa4UJmsHemFVPr0zKsewj Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 27/06/2025 00:23, Marvin Scholz wrote: > The ret value is checked later on again, so this check > is redundant and would cause the frame to not be unrefd on > failure as well. >=20 > So remove this check and add one before av_frame_remove_side_data > to ensure it is not called with an invalid frame. >=20 > Fix CID 1648350 > --- > libavcodec/vvc/refs.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) >=20 > diff --git a/libavcodec/vvc/refs.c b/libavcodec/vvc/refs.c > index 79967b77d3..1840caa4ec 100644 > --- a/libavcodec/vvc/refs.c > +++ b/libavcodec/vvc/refs.c > @@ -300,16 +300,15 @@ int ff_vvc_output_frame(VVCContext *s, VVCFrameCo= ntext *fc, AVFrame *out, const > frame->frame->flags |=3D AV_FRAME_FLAG_CORRUPT; > =20 > ret =3D av_frame_ref(out, frame->needs_fg ? frame->frame_g= rain : frame->frame); > - if (ret < 0) > - return ret; > =20 > - if (!(s->avctx->export_side_data & AV_CODEC_EXPORT_DATA_FI= LM_GRAIN)) > + if (!ret && !(s->avctx->export_side_data & AV_CODEC_EXPORT= _DATA_FILM_GRAIN)) > av_frame_remove_side_data(out, AV_FRAME_DATA_FILM_GRAI= N_PARAMS); > =20 > if (frame->flags & VVC_FRAME_FLAG_BUMPING) > ff_vvc_unref_frame(fc, frame, VVC_FRAME_FLAG_OUTPUT | = VVC_FRAME_FLAG_BUMPING); > else > ff_vvc_unref_frame(fc, frame, VVC_FRAME_FLAG_OUTPUT); > + > if (ret < 0) > return ret; > =20 LGTM, thank you. --=20 Frank --------------83CTa4UJmsHemFVPr0zKsewj Content-Type: application/pgp-keys; name="OpenPGP_0x03A84C6A098F2C6B.asc" Content-Disposition: attachment; filename="OpenPGP_0x03A84C6A098F2C6B.asc" Content-Description: OpenPGP public key Content-Transfer-Encoding: quoted-printable -----BEGIN PGP PUBLIC KEY BLOCK----- xjMEaDsehBYJKwYBBAHaRw8BAQdAtPY6tq5662mjGsrl9wixeTHtvaO/qPBio/aX SmF+pjnNJUZyYW5rIFBsb3dtYW4gPHBvc3RAZnJhbmtwbG93bWFuLmNvbT7ClgQT FgoAPgIbAQIXgAUJAeEzrBYhBDTiSNa330dpcMczBAOoTGoJjyxrBQJoOyIVBQsJ CAcCBhUKCQgLAgQWAgMBAh4BAAoJEAOoTGoJjyxrMhUBAKT3f80IXiufxCSU1rve Xp5BKwvNbY6szRdR/m21m9GAAQCGhR6t64PlMspXLtwWq9o1vjKzjWH+Bgw+UybQ CG2zDM4zBGg7HsQWCSsGAQQB2kcPAQEHQPmGNV50IFIJBy9F60ZIxe5my91pL/Sl LUWq9Z5DHBsYwsA1BBgWCgAmFiEENOJI1rffR2lwxzMEA6hMagmPLGsFAmg7HsQC GwIFCQHhM4AAgQkQA6hMagmPLGt2IAQZFgoAHRYhBEh0l9eKWUIIcnmv1LvizNAX Sd6KBQJoOx7EAAoJELvizNAXSd6KtkEBAP0jS/nBlqaVJq0iNeNDk+PnKkNBmC9p i4SuwFD71nQfAP9eWO32RXbRoIwvbrdsalWxWYmqSOdIdQE51qGMsJUuAjtIAQDA 6o6O2o2pHnWWdSqKs7Zkp4BImBD+kztmzA0Du3vJeQD/TR+qrBCXaG1FCDKn9c+Q XQNtHTxI9c6dCywjkQljOAzOOARoOyM7EgorBgEEAZdVAQUBAQdAKS1xy5312Agk deedJEXplopXco5pyANBz/edWeb7zEkDAQgHwn4EGBYKACYWIQQ04kjWt99HaXDH MwQDqExqCY8sawUCaDsjOwIbDAUJAeEzgAAKCRADqExqCY8saxvgAP9zskNI1Sti DXM4RFMoJb1aQ5TPToQZSSkGhw7JyMbLpgD/VCG7BOFjKgJGtXYEb5zpmRzNzdEB QkLsgE/vAD9GXQs=3D =3DReZ+ -----END PGP PUBLIC KEY BLOCK----- --------------83CTa4UJmsHemFVPr0zKsewj-- --------------BfGD0NiuMgFswk7c40T1m1R0-- --------------IooMbFkoh86QF8gVF6kQw9iH Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature.asc" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQRIdJfXillCCHJ5r9S74szQF0neigUCaF9IiwUDAAAAAAAKCRC74szQF0neinJa AQD0IbJpExqmM6KCi9hshKJxUg35id76yJIxdrfRXof1GQEAgWD8iQ8GFpewk0L4ElnatFvrJP7i SopAItkzoBrv4AA= =FMW8 -----END PGP SIGNATURE----- --------------IooMbFkoh86QF8gVF6kQw9iH-- --===============1435232473572591902== 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". --===============1435232473572591902==--