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)