From patchwork Wed Nov 6 02:49:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16119 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 BBB93447DB1 for ; Wed, 6 Nov 2019 04:50:47 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9A8FA68A646; Wed, 6 Nov 2019 04:50:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CAB3168A4DB for ; Wed, 6 Nov 2019 04:50:41 +0200 (EET) Received: by mail-wm1-f65.google.com with SMTP id z26so1627582wmi.4 for ; Tue, 05 Nov 2019 18:50:41 -0800 (PST) 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=y3BVSm9buyMhm+Je288FX/Gq78BZXKLPAFm3Af5LkqY=; b=YO21Kab9RyYEETS9JRKMHhYbkV/mwXV2hwrXFcd4EsLkk4wkcMN3kLpCW5plrAPxAz fghA20vzW0p0YrcbHtIsOKBGjV5cU1ieOWPMpCN8XuWrsFK1cO/odX1Qb+tozf4oeZ9s PLtSe1RQJYEGV7fJAfwyxCv51lHj2wFQf/Vu7lpMmuRWtK7dRndoqprrJiSSeOxsk4F7 Jc0o0/WtGUDO2Ky+HNaZJcVPlrV3jgDR6c4EaL357cW4UAzbLxh8oAeYMP2flbi640jz +IGk5Jk6mJHW4E5VXoXOfxgIUDrpqELeInPGnPZezskmhfMt6pntgPA+aIwP2v8SU03N +JjQ== 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=y3BVSm9buyMhm+Je288FX/Gq78BZXKLPAFm3Af5LkqY=; b=IsswVnGDwE9GUya1G0m+u+t+pFnJntau1NwHYkMDdQ8Wu31UQ8fS/RfeVvLkSBHfEy +Kn9gLRfb6MS7eEXyUmt7vWhryfygUtVxnf7DpPzKf7jQL4cJElWwvgiCyphrXKK67I6 lIPhuYdA56DFZCuS7v/aGmdLBMnNgT7DU4Lr0ntxq3wSCHfJP6e05sK4SZxJ4Sl15yrP SxQdKleJfzOxDT1Oto6xrGGj6DNg+f2YxqZaNeIanykAjpJmKQXyWeHEidnKAHdzqH0S hZlYZZxe7OTaQ4jCRr06HY6Cx1H8MLlH5sIx6oz37hs1A6ToEs0LT/dnHgK1FuAOHwud 3NAg== X-Gm-Message-State: APjAAAVgqbhFsjtKacc2b/zEng4f88zJjwiaanSSStOS2HlCLfdcT1Jd o0e4Rjheyl+8rJA4wmicxkZESpF5 X-Google-Smtp-Source: APXvYqy4r+BfRu/F10si5fqZIRR7bScKIHmKJlHcLGQC78OF/6V69iPwCFgWnuzMfdFR1TaJI9dqGg== X-Received: by 2002:a7b:c08f:: with SMTP id r15mr299633wmh.45.1573008641215; Tue, 05 Nov 2019 18:50:41 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08937.dynamic.kabel-deutschland.de. [188.192.137.55]) by smtp.gmail.com with ESMTPSA id l13sm1281710wmh.12.2019.11.05.18.50.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Nov 2019 18:50:40 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Nov 2019 03:49:01 +0100 Message-Id: <20191106024922.19228-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191106024922.19228-1-andreas.rheinhardt@gmail.com> References: <20191106024922.19228-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/23] avformat/matroskaenc: Fix potential leak of cached packet 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 mkv_write_trailer() is not called, the cached audio packet might leak; so unref it in mkv_deinit(). Signed-off-by: Andreas Rheinhardt --- When I initially wrote the deinit function, I was under the impression that the user always has to call av_write_trailer(). Therefore this has been forgotten. libavformat/matroskaenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 90400de191..de57e474be 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -390,6 +390,8 @@ static void mkv_deinit(AVFormatContext *s) { MatroskaMuxContext *mkv = s->priv_data; + av_packet_unref(&mkv->cur_audio_pkt); + ffio_free_dyn_buf(&mkv->cluster_bc); ffio_free_dyn_buf(&mkv->info_bc); ffio_free_dyn_buf(&mkv->tracks_bc); @@ -2534,7 +2536,6 @@ static int mkv_write_trailer(AVFormatContext *s) // check if we have an audio packet cached if (mkv->cur_audio_pkt.size > 0) { ret = mkv_write_packet_internal(s, &mkv->cur_audio_pkt, 0); - av_packet_unref(&mkv->cur_audio_pkt); if (ret < 0) { av_log(s, AV_LOG_ERROR, "Could not write cached audio packet ret:%d\n", ret);