From patchwork Fri Mar 19 00:52:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26457 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 CABDA44B1E5 for ; Fri, 19 Mar 2021 02:52:58 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AF35B68819D; Fri, 19 Mar 2021 02:52:58 +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 B5B65680946 for ; Fri, 19 Mar 2021 02:52:51 +0200 (EET) Received: by mail-ed1-f52.google.com with SMTP id z1so8883959edb.8 for ; Thu, 18 Mar 2021 17:52:51 -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:reply-to:mime-version :content-transfer-encoding; bh=wU5hYoQeXcvxw7HABJKJMJ93jj2JtNbLi98XJ7ZyhaY=; b=X2fbWs66xGAOKo3VrCZEg8mJ27YWERbidjoTMXMGEah5LL9auPx8mbd57YlT0T1lIt u4qMCIZdtU6dXwvtfmrD+s7uPZdOEvPRcspuD4mrJ5oX5bKutl4xDvmxVyrrWrDcwEP3 Yy22D5YDRYVY/+B3+HymjF1N29BAABwRuWmUdlAs7CaP5fJbnnMKUl9+I62cHaD8I4eH 4u5tBd1XwJ5+HR1wPB8EsQEBRKs99u5FCuut8BPW02xPkrnwR/3cWOvmoC0+GM/hSFW8 VT+IlQp43/ivfCA9qgsH1J5g67k3cCnrU9gcMfAaI+K5LcswnWLlQLv6ZZ45OS0d5ux6 NV6Q== 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:reply-to :mime-version:content-transfer-encoding; bh=wU5hYoQeXcvxw7HABJKJMJ93jj2JtNbLi98XJ7ZyhaY=; b=NINck58rtVruR4P3LH0DKwlNzGQB1uS3127Mq3d9n4KHPFwOcnT4uRGlH/u2ag5qfL 4aS2N5xv687on/rlpVPcAtasR8NY4gtKh/zfCxzMhEAGoI4b6yUQQbtLMXU1iYCmrwEm X8jChyaPlzPzDVppa/4o0ZNl8Rphqe0gWYVMu8FlDgDZD7uYIhlX39wx3Xf/r8YMtmDL V+VZPC6rMSuoasWFeN1QgsvQrwmWNM37IqdFGeDiiURPPCZFk/GOewj5APlfX2c3d9uy R7FCYkFSuRF11HNSR1pdgnDMCLaxOsRrAThGC0dn+Oe8/zdSZ4YErkdTfZEOw6NUXNct w/GQ== X-Gm-Message-State: AOAM531hs1+fHRZVR1k5ObN5jag+Vwmu7hRFKWem6ELawIA32POoYKDf wdCwoe4AGZDHW8htVOsp0ASDFyqVHJmteg== X-Google-Smtp-Source: ABdhPJyrQodPxkSZMXO107IZ9arxHF5uH23u4WzJ4njhRJAMZGgmDDXXKc7UIFrlWl0Q7cYIub69lA== X-Received: by 2002:a05:6402:438f:: with SMTP id o15mr6868227edc.123.1616115170986; Thu, 18 Mar 2021 17:52:50 -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.52.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Mar 2021 17:52:50 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Mar 2021 01:52:41 +0100 Message-Id: <20210319005244.1737816-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] avformat/tests/fifo_muxer: 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" Also factor allocating and freeing the packet out. Fixes Coverity issues #1473722 and #1473723; it is a regression since 4b386b2059806ca7ee7f991d2c8b735410693e8c. Signed-off-by: Andreas Rheinhardt --- libavformat/tests/fifo_muxer.c | 37 ++++++++++++++-------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/libavformat/tests/fifo_muxer.c b/libavformat/tests/fifo_muxer.c index 3458c3eefd..e8970259c4 100644 --- a/libavformat/tests/fifo_muxer.c +++ b/libavformat/tests/fifo_muxer.c @@ -55,7 +55,7 @@ static int prepare_packet(AVPacket *pkt, const FailingMuxerPacketData *pkt_data, return ret; } -static int initialize_fifo_tst_muxer_chain(AVFormatContext **oc) +static int initialize_fifo_tst_muxer_chain(AVFormatContext **oc, AVPacket **pkt) { int ret = 0; AVStream *s; @@ -71,22 +71,20 @@ static int initialize_fifo_tst_muxer_chain(AVFormatContext **oc) if (!s) { fprintf(stderr, "Failed to create stream: %s\n", av_err2str(ret)); - ret = AVERROR(ENOMEM); + return AVERROR(ENOMEM); } - return ret; + *pkt = av_packet_alloc(); + if (!*pkt) + return AVERROR(ENOMEM); + + return 0; } static int fifo_basic_test(AVFormatContext *oc, AVDictionary **opts, - const FailingMuxerPacketData *pkt_data) + AVPacket *pkt, const FailingMuxerPacketData *pkt_data) { int ret = 0, i; - AVPacket *pkt; - - pkt = av_packet_alloc(); - if (!pkt) - return AVERROR(ENOMEM); - ret = avformat_write_header(oc, opts); if (ret) { @@ -107,11 +105,9 @@ static int fifo_basic_test(AVFormatContext *oc, AVDictionary **opts, if (ret < 0) { fprintf(stderr, "Unexpected write_frame error: %s\n", av_err2str(ret)); - av_packet_free(&pkt); goto write_trailer_and_fail; } } - av_packet_free(&pkt); ret = av_write_frame(oc, NULL); if (ret < 0) { @@ -135,15 +131,10 @@ fail: } static int fifo_overflow_drop_test(AVFormatContext *oc, AVDictionary **opts, - const FailingMuxerPacketData *data) + AVPacket *pkt, const FailingMuxerPacketData *data) { int ret = 0, i; int64_t write_pkt_start, write_pkt_end, duration; - AVPacket *pkt; - - pkt = av_packet_alloc(); - if (!pkt) - return AVERROR(ENOMEM); ret = avformat_write_header(oc, opts); if (ret) { @@ -166,7 +157,6 @@ static int fifo_overflow_drop_test(AVFormatContext *oc, AVDictionary **opts, break; } } - av_packet_free(&pkt); write_pkt_end = av_gettime_relative(); duration = write_pkt_end - write_pkt_start; @@ -193,7 +183,8 @@ fail: } typedef struct TestCase { - int (*test_func)(AVFormatContext *, AVDictionary **,const FailingMuxerPacketData *pkt_data); + int (*test_func)(AVFormatContext *, AVDictionary **, + AVPacket *, const FailingMuxerPacketData *pkt_data); const char *test_name; const char *options; @@ -211,10 +202,11 @@ static int run_test(const TestCase *test) { AVDictionary *opts = NULL; AVFormatContext *oc = NULL; + AVPacket *pkt = NULL; char buffer[BUFFER_SIZE]; int ret, ret1; - ret = initialize_fifo_tst_muxer_chain(&oc); + ret = initialize_fifo_tst_muxer_chain(&oc, &pkt); if (ret < 0) { fprintf(stderr, "Muxer initialization failed: %s\n", av_err2str(ret)); goto end; @@ -240,11 +232,12 @@ static int run_test(const TestCase *test) goto end; } - ret = test->test_func(oc, &opts, &test->pkt_data); + ret = test->test_func(oc, &opts, pkt, &test->pkt_data); end: printf("%s: %s\n", test->test_name, ret < 0 ? "fail" : "ok"); avformat_free_context(oc); + av_packet_free(&pkt); av_dict_free(&opts); return ret; } From patchwork Fri Mar 19 00:52:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26459 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 1C68F44B555 for ; Fri, 19 Mar 2021 02:53:15 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 03DE468A48C; Fri, 19 Mar 2021 02:53:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 045EE68A247 for ; Fri, 19 Mar 2021 02:53:08 +0200 (EET) Received: by mail-ej1-f47.google.com with SMTP id u5so6898063ejn.8 for ; Thu, 18 Mar 2021 17:53:07 -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=PGQ0RVF6q8p/N3Hc+5PERdfJOLC7RFTGQZ/ESjYJBks=; b=s5ZHIKY1jLqXwjw+lqCxl+Pb+gIBmrvPDBb0e5Tj1SHF+3PUQUsjRivfMrIbNxXIHT dWwBbaw64bOUQslWSuy9oeDAholihKlekP69vFLPxKghpgScu4sDKHEaySdcGTKtL/kD 8bHurnSbbnJwwzDzUEEDcL5J71yvAA3i5Db1d23Dj4PFydm/gdSWb8xh3y0RWDLvmhjO Kxl5YRqJ8OpJIx1wQx7lq9FM6zuyRIznZ2WWyHrnUwoIzJvHoWfgAkBKtARz1SbrZ78L /2AJbluw8MmFeRjKs3yU9sXGstBPPMzwIaVeBj9MXHEb9wPXTH5vZYNTRVz77D+LPNIc 61kA== 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=PGQ0RVF6q8p/N3Hc+5PERdfJOLC7RFTGQZ/ESjYJBks=; b=WJtRYJCNzGQFLlc//aMtvbfbm2b3+FPvNVbK/8UIDYqJ31o4XbmqjIhFLCd1ce/NEg qJ/kuypaQ6MTSkN5mKbrqKJRmiojcTXVLyR0WAU7cSGcPiifQaghV0YHqxN1ZDq7xfXQ 0cK55sXiALc+/Lt4x1WCadak+CyoBlvWO6uoeD4ySqHeXEuSJyg83hBZR2S64mHjJL0N MeaWe3Q9QTzPXuez/XEcG6OmCtDWoy6ZSMs/NMqsc6Quv7bBFXMS4eYqiSDC/95mTNIU j5hbp8EFVtLgv+hHWXMcnRim1Mq1Qvew6IKkcxmiC56k5UZ12tLwxkP1T49EwBXn8/gQ I5GA== X-Gm-Message-State: AOAM530cwgl25JyXj8cDb+1+Tko8rjNaHxRLcdGzA3axMUfNV4GllBV6 gM9cq+gHZo025eX+7OqAKHrLvhBV/pNcrg== X-Google-Smtp-Source: ABdhPJzE08TUdcclfVSXYyc85rKFhZRPZVgHh+hJPEBm5BUARrcCiLBCKFQGKPFfRAxOoIdEg5eiyQ== X-Received: by 2002:a17:906:4bce:: with SMTP id x14mr1418658ejv.383.1616115187357; Thu, 18 Mar 2021 17:53:07 -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.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Mar 2021 17:53:06 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Mar 2021 01:52:42 +0100 Message-Id: <20210319005244.1737816-2-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 2/4] avformat/tests/fifo_muxer: Fix memleak on error, fix API violation 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" The test program for the FIFO muxer allocates a buffer without padding and wraps it into a packet via av_packet_from_data(). This is an API violation. Furthermore, said buffer leaks in case av_packet_from_data() fails. Fix both of these issues by using av_new_packet() instead. Signed-off-by: Andreas Rheinhardt --- libavformat/tests/fifo_muxer.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/libavformat/tests/fifo_muxer.c b/libavformat/tests/fifo_muxer.c index e8970259c4..227c3d0210 100644 --- a/libavformat/tests/fifo_muxer.c +++ b/libavformat/tests/fifo_muxer.c @@ -41,18 +41,15 @@ typedef struct FailingMuxerPacketData { static int prepare_packet(AVPacket *pkt, const FailingMuxerPacketData *pkt_data, int64_t pts) { - int ret; - FailingMuxerPacketData *data = av_malloc(sizeof(*data)); - if (!data) { - return AVERROR(ENOMEM); - } - memcpy(data, pkt_data, sizeof(FailingMuxerPacketData)); - ret = av_packet_from_data(pkt, (uint8_t*) data, sizeof(*data)); + int ret = av_new_packet(pkt, sizeof(*pkt_data)); + if (ret < 0) + return ret; + memcpy(pkt->data, pkt_data, sizeof(*pkt_data)); pkt->pts = pkt->dts = pts; pkt->duration = 1; - return ret; + return 0; } static int initialize_fifo_tst_muxer_chain(AVFormatContext **oc, AVPacket **pkt) 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 ) { From patchwork Fri Mar 19 00:52:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26461 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 4042C44B555 for ; Fri, 19 Mar 2021 02:53:19 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2DF7868A42C; Fri, 19 Mar 2021 02:53:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D2DB2680946 for ; Fri, 19 Mar 2021 02:53:09 +0200 (EET) Received: by mail-ej1-f46.google.com with SMTP id w3so6895635ejc.4 for ; Thu, 18 Mar 2021 17:53:09 -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=93bQ5zaGNNiSekmvFs8qHVlUsf+qxUzrvDdEnCfCLc0=; b=f1egiD8++kiyUyEIXNTVgAuQYQUX2PbeHzPSasTmGHWYsiTHEfCf8RZvR2K2YL4Ep+ +4LGc5ujjwQ5WYFkxI9G2rjA8k/qhKrSOfETi2/Msfor0QCiBTrM+yEDCE7iH8HLxSPp N3yjOKSKkBG+ydbB3NQKnp2yghceK4tcq3JMs1xZkO6ifOZfHDGNQAFg8IL3cU4v+JFf 4liFtm+Ud+E4Q5eNrWkttvhfeGFfjwhteNrO4goIC5nFVrzT0SwMN7O62Pt91pYfR5lF gtZwNUbGGqmWlJg9qYijc4hP+NtKQ5AYhoBhN3aW7SUi+u/t43voQ9u0xPs6H5PG4QMX S/dg== 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=93bQ5zaGNNiSekmvFs8qHVlUsf+qxUzrvDdEnCfCLc0=; b=rCMrqc2qfnM++OnxkOQsnW7IvOZ0foXD+TXI3X4G+1p5vBnbewLTyYy5Who7yQruIJ J10FHOw55LLByr2YiOc5S63l5RvM5glyFbS2COcEpJxa5GYH02khik1SfNeYj/TybFRI Q+e2c1GBcVH+MKUby+zeiTDMy+nXYuJfXId0qplSvS/fy20b2BDjkQfNPZGCbn0rBlfQ A4q/8zirxqAmPBK8XSRxNvJTNtbvJq5FIOWAbb6u/I5sEmmolKmrWIqUn+uMcTRbxf0t D7qlBE/BfmFIvz3gpH8foYKvM2MGiXInh/I3ulShParQHB4O6tcBxRFZkP0J7wQygXh2 dY9w== X-Gm-Message-State: AOAM531O8/7xsh8uOnyR/LKdioKEH9c0JK2jlrvq6CPIZHL931turD7A Q6fMUh1cprsqqF412YsNBDitGbwZdQ9OIQ== X-Google-Smtp-Source: ABdhPJyrwo7msLX6Qr7nIhz6YtQHRQEPHhviXHRMxx5hYCUAuMEfNIqj/0NCJc7zyi5YTRytP0ZREw== X-Received: by 2002:a17:906:d554:: with SMTP id cr20mr1475730ejc.61.1616115189031; Thu, 18 Mar 2021 17:53:09 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Mar 2021 17:53:08 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Mar 2021 01:52:44 +0100 Message-Id: <20210319005244.1737816-4-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 4/4] avcodec/libxvid: Remove set-but-unused variable 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" Set-but-unused since 2101b99777860c853ca2321031eb3f4047dc5894. Signed-off-by: Andreas Rheinhardt --- Before 2101b99777 the packet was only unreferenced on success so that said commit seems to have fixed a potential memleak. libavcodec/libxvid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index 25b0025d5f..50601807a7 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -685,7 +685,7 @@ FF_ENABLE_DEPRECATION_WARNINGS if (x->quicktime_format) { AVFrame *picture; AVPacket *packet; - int size, got_packet, ret; + int size, got_packet; packet = av_packet_alloc(); if (!packet) @@ -716,7 +716,7 @@ FF_ENABLE_DEPRECATION_WARNINGS picture->data[2] = picture->data[1] + size / 4; memset(picture->data[0], 0, size); memset(picture->data[1], 128, size / 2); - ret = xvid_encode_frame(avctx, packet, picture, &got_packet); + xvid_encode_frame(avctx, packet, picture, &got_packet); av_packet_free(&packet); av_free(picture->data[0]); av_frame_free(&picture);