From patchwork Fri Mar 19 00:52:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26460 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 53D8544B555 for ; Fri, 19 Mar 2021 02:53:18 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 388E568A57A; Fri, 19 Mar 2021 02:53:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D64F768A247 for ; Fri, 19 Mar 2021 02:53:08 +0200 (EET) Received: by mail-ed1-f52.google.com with SMTP id bx7so8841833edb.12 for ; Thu, 18 Mar 2021 17:53:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=1nkKUzymxilKbXCfM+psnUHLN/VEy8FSTZ7/dXAOBYg=; b=mLj+sdbcJdQ3HU9ZxeklHj5tpBtVasvfjMtgjsBrMQJ2WPYBzfEGNCODQT1AgQrz0X oU7SU/3YS6PNzASzvDCbeC5bXFqgLKC1PcrSzZu24sUyEPgtwWyw8PHhFnWZk1W2+gh0 D4uHwI+Uw3QsaOf7o0ZQtiGY5bu8TIBnO7NXIZOfrQ3ER4h/eNDzX0lXWyceI+drY8jE /yqV10+0PF1oqObzN31HfK7iPQmS767C0E7bF/V93bFJ6QbEmbmHW5Nm9zwuuuQxEj5Z poMG6yjHQr1TL81rqMzjphmtgROkiq2Qjz8TP4bg/fgeUTRksK8cFuCso7B7Im5NRYZy a+/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=1nkKUzymxilKbXCfM+psnUHLN/VEy8FSTZ7/dXAOBYg=; b=S7LwDswyPl6iyiIqrijc4Bk10P6GAcxTA4hJbHOodrA29skAfIE8L03KSNXslZTfLL ZN2w4wA28j9HX1GwPRVpQS4DzvGOthzFvs+KpPBLv9x5iLENB82FWPCDAr0zBNgz8X2H dt5r4tiyQmWkZf5u9f02n3f8ViGsG30QIYinTlY/j42K9tpwGWFd/O1mvaTuhdnFLDwL 75+lq14eXhiAMa4St50btKxvcgInLNR+vJSju4lmXFQ9MPjylIePdZ6UxlS2pbzcY8n+ Au/Ut0llmlTQBRs+N5GSVf2DsUJVP/Zf8BKQ6yUSvUfIDuhwxaw8e5fuHCVBQT2nydfK OHcQ== X-Gm-Message-State: AOAM532QTD6PNVZij6ULYe0PYhtBuJQvZURxWaMIEl0zc6vYwVdPbvPc yKCxxcdCmDT2cJtR2PDGNzV6MNsFJqKa2w== X-Google-Smtp-Source: ABdhPJwjxilpJtZOA4vCBUGDfPiUdVRwgiNE6rVA6sOdrqxsVpgNAzXwYzhOU6ODIo1nKZEeaSEmgQ== X-Received: by 2002:aa7:d954:: with SMTP id l20mr6846465eds.1.1616115188253; Thu, 18 Mar 2021 17:53:08 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08960.dynamic.kabel-deutschland.de. [188.192.137.96]) by smtp.gmail.com with ESMTPSA id r10sm2779304eju.66.2021.03.18.17.53.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Mar 2021 17:53:07 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Mar 2021 01:52:43 +0100 Message-Id: <20210319005244.1737816-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210319005244.1737816-1-andreas.rheinhardt@gmail.com> References: <20210319005244.1737816-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/libxvid: Fix leak of AVPacket on error X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Regression since 2101b99777860c853ca2321031eb3f4047dc5894. Fixes Coverity issue #1473721. Signed-off-by: Andreas Rheinhardt --- libavcodec/libxvid.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index 7dc6859571..25b0025d5f 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -692,8 +692,10 @@ FF_ENABLE_DEPRECATION_WARNINGS return AVERROR(ENOMEM); picture = av_frame_alloc(); - if (!picture) + if (!picture) { + av_packet_free(&packet); return AVERROR(ENOMEM); + } xerr = xvid_encore(NULL, XVID_ENC_CREATE, &xvid_enc_create, NULL); if( xerr ) {