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 D11A54FB4B for ; Thu, 26 Jun 2025 23:24:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 74FCC68E6B6; Fri, 27 Jun 2025 02:24:04 +0300 (EEST) Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 4C25468E464 for ; Fri, 27 Jun 2025 02:23:58 +0300 (EEST) Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-ae0a0cd709bso532254466b.0 for ; Thu, 26 Jun 2025 16:23:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750980237; x=1751585037; 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=dUPvLZ0K43MaRNvoLiyinUXIHaBtpVyf1Q2R3Wk54rk=; b=Otiqn3i7Qw1tPYWwx/4hJ5MGYa+ZW7jh1iua5jE3Q6fWM1n9ubLy69W5eXZonvsRqa e1DhcXDcC28TEyW0wduSATBjr0virIo+Nk8tnJzvu7TPZtH2Ri3aDFEgF90ZFvunttcS 7u5wiiDOSbsSWAb3rS1nqdueaqGD5tJjLlVV5zqmHMta3HdIQtool1IEv5ZGGsicY2LV lCYCTMs+hhWBzWSPnA4BWukGYsfM53SAskJ2JDmyHWVm9U6P6zdoeyx7FxKTcDfVhJuG G5l7B4pEObh40aExkGj8R60Ru+/jC1geDNCg72OQEnbrfCuOeLQ5V59iYJswLdPyuf3i k/nA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750980237; x=1751585037; 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=dUPvLZ0K43MaRNvoLiyinUXIHaBtpVyf1Q2R3Wk54rk=; b=LTouj4sdcj18E53c3USn1jS1OTVuZePdZ2K6GznjmL4wPOVQyag68vWphapodgrZT/ F2gOab38E+y+/BA4naJVS6LfbGz+zXmAbymqP4tMJaPn4znCaFB2uKhPRZSb9KAvEBGJ 5wFkWMZTrPhSs4QgH1EZWdk12T1EKoin33z/CplFn8JTItOe02mru8xigTqhFfXKSzfJ fOvDCCRQuUpqxK06aDL1Bn2mnbwY+oLEtDKpdJG5hpA/sgTlG93jBtZLutIt/i6svpA1 +QQeJEqSPYPKvenEyoz57SBPOptKN2RHYNWBg3Iy4luNqI1c3/q/05D+gpWG1EY94Vja VFJg== X-Gm-Message-State: AOJu0YyvUzCgB5RAQhz/xQJz8bnVdpNN2EYD3tnFVsJ7NhbgC1my/cax GOPh8fShuClvZ2Wd/prXWlew1z71YbeAhhU+WxuKcd9kzZRIsTWDk+se/6TKBQ== X-Gm-Gg: ASbGncuDB5pQwjDp6g4GdIx+oiaW/ftiKRnyevYditTxRws6a2TmdF+hFWrP4aPKNah 6iJgKyWixQLAnV8Ww7lgJvY4eK15iJqWPnSTth0bOj6/HsP0vrHvJPi0pLrVF3bLVUWFl4iqnVv ebAEBmbkJVY3tHyFbPTwoe6ujN8rgcAJVi7y6s8v/MnXOqfmeSHz+2VY2j5rvwUGHxiEO68FGTX ejQcDax/gSioF+CwRrD/X+oO9HxIdiLeAis6nupLNKGpeNXoVSXjlYNaXInATcBHgaJSYUojZMN FjMc3AbeLAmhhaFQXALnWzpHqKBeDlZIU/Cza5rvHxPrbyd4Uyg16/F5RibPVMn1FwseBzOMdCv d93UoOGqcvwNRQWO9r+yI/inQQddeZeWwzjPfZEtnHiDfrCnaBcJ4fzZmNeSN5FNuqRQICohb2y 3Yrfjc X-Google-Smtp-Source: AGHT+IFTEc7sC3rAy5jqGz2MZ6E5Io0T2wdUweAv5xYi1d0D4dkB4CcN3y5XLADYstgAhOEOKT2fNw== X-Received: by 2002:a17:907:1ca1:b0:ae0:620b:be14 with SMTP id a640c23a62f3a-ae350212943mr80420266b.4.1750980237242; Thu, 26 Jun 2025 16:23:57 -0700 (PDT) Received: from ArmedBeast.fritz.box (p20030102370045007d7f230e46ac5795.dip0.t-ipconnect.de. [2003:102:3700:4500:7d7f:230e:46ac:5795]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ae35365a95esm14745066b.59.2025.06.26.16.23.56 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 26 Jun 2025 16:23:56 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Jun 2025 01:23:50 +0200 Message-Id: <20250626232350.42335-1-epirat07@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <0ba7d6fa-7b81-41b7-ba54-711c4c4bdac2@frankplowman.com> References: <0ba7d6fa-7b81-41b7-ba54-711c4c4bdac2@frankplowman.com> MIME-Version: 1.0 Subject: [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: 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; -- 2.39.5 (Apple Git-154) _______________________________________________ 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".