From patchwork Tue Mar 31 12:37:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18538 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 B9B9244AF30 for ; Tue, 31 Mar 2020 15:46:18 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9F11C68B1AF; Tue, 31 Mar 2020 15:46:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 880D668B14F for ; Tue, 31 Mar 2020 15:46:11 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id c195so1061074wme.1 for ; Tue, 31 Mar 2020 05:46:11 -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=Racd5NPeWUvS3Mod1mgqBV6dFj8nFq60AjMoNz9485s=; b=WoDEPayvIxlYUvGdaRf+xtvnnIaaAzihvkQi/+pQDMN1pgZSwIIYca1atMSW0mlukS VcFiBn75qej9tubc6brd2EF9PD2iNCY+U1Qi6vyheUno8ACX+YM+yBNxvGCtA/8IZL7b u+rNHQEb1K6xBERCu4fRCsulj9cgsnfhhg5L1z0uJX4nGs6En1t3YXQ53/0Kbtt5wjOf wtwHju5BjxAD7Dc5VIwXHmm+OlhjHRKqt5N+cISTrPSrHLsfqQNPDOhsiaaa7BkZiCHE fFzz8s94MLw/Ned7m1rWqoCitUz97dp10gso5/HRDJveJN18KJHdbLfbs8uR1MczA9Gi j/2g== 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=Racd5NPeWUvS3Mod1mgqBV6dFj8nFq60AjMoNz9485s=; b=fCqSY3N8bRPj/unBPvM9ffb4AT7c195ELDiAKanzDhrVRvDncM6BzlvHJ3o5IRCemQ r3IUOlVY2D4EhDzHfIrfZqhm8YJRB0q8qfDz9TXKEjgmrje1Akgp6SVcn3Sxa7j/tXgz CxWnZqzODZNNeLuFj/zCuXgcCyhcePcmMhBCoDBcCq2/CCZG3Cf3vWCIDTNRByz7jfKd RjMP82AwNrqYvQXbphqfwDvyAT0d/8A+OzRlAn45Z3F4oD+LOA8dC0fuWmQEYcaq37BG jEuOQ5GLtWL6+0Yd+eVlXCv/zRn9yoop4gKW2L7LPCbbN+WrfbCyp4imyfjRUyrbbNP0 JaHQ== X-Gm-Message-State: ANhLgQ3BAEVM/cx8//1FTfKWXzd+Z1aPZZc2RVteOOev91qVKoTj6Pfl JnGk2oK6r3NwOeDtz0TR8GW0+z/h X-Google-Smtp-Source: ADFU+vuA6lBP7SZ7BwqnArMxVSKQkoz0ZiL7sVp88zc4B7b+YVxkvI185XDfM0rOX0G1mqpRcnUOzA== X-Received: by 2002:a1c:5506:: with SMTP id j6mr3339348wmb.127.1585658308381; Tue, 31 Mar 2020 05:38:28 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id p13sm26301532wru.3.2020.03.31.05.38.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2020 05:38:27 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Mar 2020 14:37:37 +0200 Message-Id: <20200331123745.6461-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200331123745.6461-1-andreas.rheinhardt@gmail.com> References: <20200331123745.6461-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/10] 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 2e83031bd6..f10c83d7c9 100644 --- a/libavformat/audiointerleave.c +++ b/libavformat/audiointerleave.c @@ -134,10 +134,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;