From patchwork Tue Aug 13 02:47:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 14464 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 486E3447E79 for ; Tue, 13 Aug 2019 05:48:57 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3763068ABC5; Tue, 13 Aug 2019 05:48:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1AC1968ABAC for ; Tue, 13 Aug 2019 05:48:49 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id b16so9617387wrq.9 for ; Mon, 12 Aug 2019 19:48:49 -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 :mime-version:content-transfer-encoding; bh=46b/d/FyQsOy4EACA/jRyCcKq+J9EVqE5QRYXhNlsDM=; b=MIu0rX2BGin4+EJKHY6EpF/4SgQlar8ffLRhDK7OFSA9qWLIQTVKO9px9wt5CAbqS5 g14taYRT+4f2eYwh/n0lGUt/eQxlMtHVbxp35pN+lSvUltZyvUtkvJY7ygc4dFdggGco KtbBLDKoOGeWaBi7YNBExR2fBOh8D0fAruF9/12O8HtxrsN+d+yHeZObe21TjPytbPGL 5N3yxD4Dbkro8mxXo0a78c6bE9xylCYmFi0q+3YxAYGX37EWcAJE6eL96Mn/KMowE5yJ 3vpZKGzLluNDnwXyC1vNMDqD1RL25uutbTCfNF3SY3QacqP3r00hHhYjVk1RpRiq5+1p WhJg== 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:mime-version:content-transfer-encoding; bh=46b/d/FyQsOy4EACA/jRyCcKq+J9EVqE5QRYXhNlsDM=; b=f2Bp4yCePEt7OX2CiXHdVudMmdBZU08jFxc6x5GuGr9s/302nr18A3dImEGefXwZ8y /fLmzG0quj1kjU0HH4gI+NwZLd5liLgRR+czZ8lPgB4rZEMjDDel1PkeeQTDG/IoFBWF 1MsjhuQpcSZASVpsFDPJ3pHjCku/zy9uhJhqZMH0MHZCdJnc093tZgjoTjUSzQ8Q71sL mxQnhXoUcthAVE3IakLzcekHIXaxP0ryxCO09Ie2Sq1A1a1GpEm4jGFQ2S9FPjeqy8lB a2Qvccw8T5YrWTOa+DgAbGVUXFdDMPLf++XGAcmjy3YVYOwdYQA7c2nlTIc9YfAMKzeL zM4A== X-Gm-Message-State: APjAAAWSixj/l6YFNYt1Qx1OmyNZi1lL+mFwQCoafidhGrMPq4XPs2Au /t78nWPnHo92mxzCfdC6STMaFYS7 X-Google-Smtp-Source: APXvYqwMJ/PF68+/DPF9h5FTKo6MZNK24uGQAao2CMA6SeDBQUduasE46zhay7w0Nq8X3llqERSNAA== X-Received: by 2002:adf:cd81:: with SMTP id q1mr44945114wrj.16.1565664528485; Mon, 12 Aug 2019 19:48:48 -0700 (PDT) Received: from localhost.localdomain (ipbcc06ceb.dynamic.kabel-deutschland.de. [188.192.108.235]) by smtp.gmail.com with ESMTPSA id k13sm25020613wro.97.2019.08.12.19.48.47 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 12 Aug 2019 19:48:48 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Aug 2019 04:47:20 +0200 Message-Id: <20190813024726.6596-7-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190813024726.6596-1-andreas.rheinhardt@gmail.com> References: <20190813024726.6596-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/13] avformat/audiointerleave: Fix memleak 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" If ff_interleave_add_packet failed, the content of the newly created packet new_pkt would leak. Also, it is unnecessary to zero-initialize a packet that will be put into av_new_packet lateron as the latter already initializes the packet. Therefore this has been removed, too. Signed-off-by: Andreas Rheinhardt --- libavformat/audiointerleave.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/audiointerleave.c b/libavformat/audiointerleave.c index b602eb7105..b7f4113b68 100644 --- a/libavformat/audiointerleave.c +++ b/libavformat/audiointerleave.c @@ -136,10 +136,12 @@ int ff_audio_rechunk_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) { - AVPacket new_pkt = { 0 }; + AVPacket new_pkt; while ((ret = interleave_new_audio_packet(s, &new_pkt, i, flush)) > 0) { - if ((ret = ff_interleave_add_packet(s, &new_pkt, compare_ts)) < 0) + if ((ret = ff_interleave_add_packet(s, &new_pkt, compare_ts)) < 0) { + av_packet_unref(&new_pkt); return ret; + } } if (ret < 0) return ret;