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 ESMTPS id 545BF4E4E6 for ; Sat, 3 May 2025 17:56:01 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0A9A468B8D7; Sat, 3 May 2025 20:55:47 +0300 (EEST) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 99E58687D93 for ; Sat, 3 May 2025 20:55:38 +0300 (EEST) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4394a823036so29331715e9.0 for ; Sat, 03 May 2025 10:55:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20230601.gappssmtp.com; s=20230601; t=1746294938; x=1746899738; 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=lbVFMI0H1qBnohGh1LdfSxuKbMlWcztCKwITZjBs9PA=; b=jGaRpcBaVgF/gdYgSR/SWOBAvBWbdoEaIXFCwgPDtgqN/ZXjVV4Hndmw+2d1bRff1e pLjn+lb/JSpxNgDBtYYeSGI+RcbQAfxbxeRrQZBALe0VOw+/l2h8iQ0YyJJr5S+N6vKm fU6GySfDNITwqFMzPur9y4MJgS+3EtwyLiMJdQfRtzj5MnsYOXI8OfE4jGCODb8Mb7GG 79cwoORDOleW058F9EFYttZUgpDPGJYWD+srkgq+CoONr/ottQX90H02BVHeASM6aCaq wE0r5cmO1UzvXTQAgxozK3jPRKzLbmvhMwa4a/iLsVg/w36FIayKH2ZPsg++ktlcwQWo r93g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746294938; x=1746899738; 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=lbVFMI0H1qBnohGh1LdfSxuKbMlWcztCKwITZjBs9PA=; b=kgRDvrSKsCRhvsKrBwMMT+DOulya9aTLA2ua+9gVrylyTiHh2h80bel8yMSIqvvODD /DvA3nGzthdd/kppHpZ3t8rRGGJYtBVE5Luj6JpHom5ruzpn31Zh/QGI+HlPB2dcY2Ya AYLh6xjizNp2VhZvEPTAT/M4nXQXJLLZ5P0obN5zhOaAZrCq8eGQOAqAQLmGhdGKXzD+ FCnEvhgk92Rl9oH3D8Zcc2eCoz1gPKycxcG/Kiu7AglwwAMSiGI9Wseq9vIploowPgYm hNPEjWqtAkCUo4QyF7HSs1nRyPAr5L6G+TeuwBCi6ZfUgRFiH9lq8sXceW8c9uUkx2Z+ aQEg== X-Gm-Message-State: AOJu0YxmokQYxJWZKCeO2WU1Gfx8xCeghhzF7qCqb/nhR7dq909HRxyr g8gQ2+30NEFJdcaJ3y3ypsaaizbRou0AmUqM2HAcqtlWUjYJZzViIlLDHJbwb3LEd3FtidWE3dA ocjRhDA== X-Gm-Gg: ASbGncshKI4laXkND6aVoiLoLD8LcxbP0Xfsx7jbGQUC2puJqdfvNC+DgX07Nh/fjMd TKVTyotitukI0ZrpOkUeR8AOoLKV9SSM2MdWU00gLjSOGob6i9Aqsn9SJ83/TKYAc+SKPiJhjcT NIB7OAOhdmrxa79swoNiNx00Ga0uVu1rNokvg3GMFZfwSbSuqgx7O5JxRThhCMM8EFVNjLS2aDz S1VL5VWib9V3gTPbC4ZDGVPAFS1XDDcqpP+1YtQEQ+qKJjmo1LQrV8MfJssZrHNXDVc9MnxXftS fCBn1rm/qiaBcL9khIhIJ2xsDumm1RaXeU99RaJyM8n3NWKd/bLmDTRh2kVO4wST4tmZK/AovlU +/Kxuw/aLomPBJgiyJEyPGC32bl7N9wHKeA== X-Google-Smtp-Source: AGHT+IGfWHbyWByhXNTV5J9pXa5A7Ktc6mo4FlsTzDu6vUf0qWbQLjx9CptUUpAhjRtXrJ9vvcwzGw== X-Received: by 2002:a05:600c:3548:b0:43b:c284:5bc2 with SMTP id 5b1f17b1804b1-441c1c70f1bmr24157085e9.0.1746294937942; Sat, 03 May 2025 10:55:37 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust719.5-4.cable.virginm.net. [82.13.66.208]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b8a3156asm80683645e9.38.2025.05.03.10.55.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 May 2025 10:55:37 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 May 2025 18:55:18 +0100 Message-ID: <20250503175527.1517092-2-sw@jkqxz.net> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250503175527.1517092-1-sw@jkqxz.net> References: <20250503175527.1517092-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/6] apv_decode: Fix memory leak on decode error 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: --- libavcodec/apv_decode.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/apv_decode.c b/libavcodec/apv_decode.c index b1e1db7d64..2a59c9b25d 100644 --- a/libavcodec/apv_decode.c +++ b/libavcodec/apv_decode.c @@ -377,7 +377,7 @@ static int apv_decode_frame(AVCodecContext *avctx, AVFrame *frame, case APV_PBU_PRIMARY_FRAME: err = apv_decode(avctx, frame, pbu->content); if (err < 0) - return err; + goto fail; *got_frame = 1; break; case APV_PBU_METADATA: @@ -412,8 +412,11 @@ static int apv_decode_frame(AVCodecContext *avctx, AVFrame *frame, } ff_cbs_fragment_reset(au); - return packet->size; + +fail: + ff_cbs_fragment_reset(au); + return err; } const FFCodec ff_apv_decoder = { -- 2.47.2 _______________________________________________ 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".