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; }