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 E27BB4BBDB for ; Sat, 28 Jun 2025 13:22:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 9243368E376; Sat, 28 Jun 2025 16:22:04 +0300 (EEST) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id BEE3968E1D2 for ; Sat, 28 Jun 2025 16:21:57 +0300 (EEST) Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-3a4ef2c2ef3so641802f8f.2 for ; Sat, 28 Jun 2025 06:21:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751116917; x=1751721717; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=I1Qa3BH++WBVBdZgsacpEi1PpKWsmy1vomDJak6wbMM=; b=Ih5tAv1Rg4OO4CEjemTj/80exao9tueXkIgPHJUcZ6/iBgnynYV8cFf/dKv5QkvzsM P7rGL9deHYvArnUXyTKUWnCHwrs9Vb27GLizN2YP7l0BGACwFEKTsL3UXJcf3yfy39EJ GI4GY3As7EqqUhA539gRAq1+SRiLtqIbDUKF+TwAk6yXFS9NU8sBVDKT+mcV/TT+7aWu pxicC+B2u2CgmEA3y2Dh7EvuTZsX6hUhgRS5dAn+n+8AGN/lPHqY8n4j9tlkBJrBGr21 /klJre6Kln48t69eS4vq+SG5BqPAkio9/kFNRHbgYlxcivTbgY8dWKFceFdHGc2WOs/A LOAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751116917; x=1751721717; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=I1Qa3BH++WBVBdZgsacpEi1PpKWsmy1vomDJak6wbMM=; b=xILjHdvscWlDPVohcugO0GEXAul3aGTAQylOQnX0PmJZSQvek0vz4lbSwiqqlXigL0 qlFdfCna3LbX+OyarL9SKO2KppObpfEYmCZ2KgXw4XhX1Mh3LgcK+/VL/iP5OwyLmkBs VPNGEYAWxj/j1cOOo8rVyS1vABsbCF15Ekyh/rTK1S2pABZfsvM9PPk/t4yL8ReiRIJp lkk2Rv3Z1ZVQ7BJnhAaYhsi7KubqXdmFlM/gq+MYOKcHiRVc1w3nYmrILWCYy5/W/o0A WizQpL5dG+RXf5xwP5pis3qxKdeM/y3DjERzX6A4StUkoQbaFWlCyJ6kiqQXvkqq9rcj hKpg== X-Gm-Message-State: AOJu0YxwnhHIcaywyIVALjjFjAGUqLvLQ5ljdYv/8/Ib2enEN7JZ71nJ qiGkIsUr7gDgPLNkLTZD4lyTuJ7RLl3CN64O2Qg9w1P6hBarD/CvztC91NakgQ== X-Gm-Gg: ASbGncszT745VBhV8yD1Y2DqcLT9wycVxJF8ril/6CD1N61limNh8qCciI2DUXmdyhH rYaAGQPUmjTt0DJUVTuS2jMmJLM7WtM+JjEfkrjX9UWzecg9mIGos0TQcUvGjGe5AxcpfLkcrFT eRwx5vqh5y+s6EZTmlYXCnLkssW78CgW5CxW2ZjxwjLChp1wIZ/3fFBQBJlh0kvjVqPxiagVJ4o 8pnuwzf+dlNwF/ZnZLuelbHxbMINJGsSPzV9R1fl9Al8vzHa3MXHMIZHUiWIywo2ZdSop5iFMxz QD8GvzCSSQPK5ILMmxA+XHcPo/l7Q2im6kHvy3LO4x22U13pSfGUgSongTrCunSxU9TOYDLBwPp TKvwRPN5FoDGKeW7/HkSTae3eIdtZEVMu0lBHEj2b+KINlgZkjVtmaST6XoA2vmingC5vg9oOqd KJUu4pQFNJLQ== X-Google-Smtp-Source: AGHT+IGNSZBQB6U6FXInoebjH8UPgXGWedsGSY9OGEcUd5PVcZymcS/btlFic6X7YPymKd11dzgLeg== X-Received: by 2002:a05:6000:2a85:b0:3a5:8c27:8644 with SMTP id ffacd0b85a97d-3a8f4ee0ff8mr4071276f8f.24.1751116916702; Sat, 28 Jun 2025 06:21:56 -0700 (PDT) Received: from [192.168.178.57] (p2003010237004500d82e3c7de7372df5.dip0.t-ipconnect.de. [2003:102:3700:4500:d82e:3c7d:e737:2df5]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4538a3a68d7sm81293105e9.14.2025.06.28.06.21.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 Jun 2025 06:21:56 -0700 (PDT) From: Marvin Scholz To: FFmpeg development discussions and patches Date: Sat, 28 Jun 2025 15:21:55 +0200 X-Mailer: MailMate (2.0r6222) Message-ID: <46072812-2192-43A5-98FD-9FCAA6ACBD73@gmail.com> In-Reply-To: References: <0ba7d6fa-7b81-41b7-ba54-711c4c4bdac2@frankplowman.com> <20250626232350.42335-1-epirat07@gmail.com> MIME-Version: 1.0 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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 28 Jun 2025, at 3:42, Frank Plowman wrote: > 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. >> >> So remove this check and add one before av_frame_remove_side_data >> to ensure it is not called with an invalid frame. >> >> Fix CID 1648350 >> --- >> libavcodec/vvc/refs.c | 5 ++--- >> 1 file changed, 2 insertions(+), 3 deletions(-) >> >> 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, VVCFrameContext *fc, AVFrame *out, const >> frame->frame->flags |= AV_FRAME_FLAG_CORRUPT; >> >> ret = av_frame_ref(out, frame->needs_fg ? frame->frame_grain : frame->frame); >> - if (ret < 0) >> - return ret; >> >> - if (!(s->avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN)) >> + if (!ret && !(s->avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN)) >> av_frame_remove_side_data(out, AV_FRAME_DATA_FILM_GRAIN_PARAMS); >> >> 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; >> > > LGTM, thank you. > Thanks, pushed as 7d384869751b45d4d057df67dde9050a82590a6e > -- > Frank > _______________________________________________ > 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". _______________________________________________ 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".