From patchwork Thu Jan 26 19:26:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasi Inguva X-Patchwork-Id: 2330 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp341071vsb; Thu, 26 Jan 2017 11:27:41 -0800 (PST) X-Received: by 10.223.179.26 with SMTP id j26mr4149507wrd.126.1485458861074; Thu, 26 Jan 2017 11:27:41 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 72si31219wmr.49.2017.01.26.11.27.39; Thu, 26 Jan 2017 11:27:41 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 32AF068A85E; Thu, 26 Jan 2017 21:27:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f169.google.com (mail-pf0-f169.google.com [209.85.192.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5FF7368A845 for ; Thu, 26 Jan 2017 21:27:29 +0200 (EET) Received: by mail-pf0-f169.google.com with SMTP id 189so67415373pfu.3 for ; Thu, 26 Jan 2017 11:27:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Ag4KmJjJD1gUn+9trkJpErSWwfsmxrzwuRupa1YIUQk=; b=RUsrcn+mY6ef+88qBfkZNEDC8A6/vrKHedc6hFdHNqTMv1lRgjdTtZGl6riYLozG5n mHR4t1j/xO193IJ2UCuZqRy402DGk1gXD8ekA40hzIwo8q29DKhw8+J8V79kydEswOna vimuPq7LPyxlMIN1NmWn7ltnfrX7BEy5JSse3IUDk52BWGQCwxkw42CQuZowQmwv+/Xs t1+94mutSlZbQdce0Yw1wt0xjWzQVMUsspAvmkIhusiZxubG1wP4QB5DlJf4TzDdUtpJ vJ5vj6fuc1ZAqQe2j7clYoMdzy3c3rPDoFoykxyqgbJ1aWGCxD3A1Tvu/wtmcUE1K1lp 6+aA== 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; bh=Ag4KmJjJD1gUn+9trkJpErSWwfsmxrzwuRupa1YIUQk=; b=sIx0V4RgvD9rzgkpOoY7ONG8slmekJ6T6Be06oYJvUZi1Qw745b+Am7HQwqd65enWX nxntGF20LcDJHseuRebEpjA6qUbH1ExLDOeOa9lXPQz6nI8s7IFOOZbIVLFQmcR7gVfv STnXFYnrcWylIAYaxVuz/ptAeYe6Y4Gbg/kYtxvB0rRNA9yDKClkRnW8Vm23fLA9Fecl iFEcMN1PkQB4LRsW82xyjO8xPRR4jrhsUpIKv3QoqvWC5k8ZcVEZYL6UPnQnDm7U0TN/ 0hCYdO3hbbqa77B/tEAdpHjRuceDffQpG4ubU62i4GwquHbRMNE40idE0CKfVnZGfgzr KCdQ== X-Gm-Message-State: AIkVDXLOCgPtT85llu0BDMFJFg5U40TUB5boK+SIJvqSEXiG3ux1WBRHJMZ6OE9FCzJlnWpj X-Received: by 10.99.47.199 with SMTP id v190mr4890183pgv.26.1485458847947; Thu, 26 Jan 2017 11:27:27 -0800 (PST) Received: from isasi.mtv.corp.google.com ([172.27.82.89]) by smtp.gmail.com with ESMTPSA id z77sm5302385pfk.47.2017.01.26.11.27.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Jan 2017 11:27:26 -0800 (PST) From: Sasi Inguva To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Jan 2017 11:26:46 -0800 Message-Id: <20170126192646.15270-1-isasi@google.com> X-Mailer: git-send-email 2.11.0.483.g087da7b7c-goog Subject: [FFmpeg-devel] [PATCH] lavf/matroskaenc.c: Free dyn bufs in mkv_free. Fixes memory leaks when muxing fails. 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: Sasi Inguva MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Sasi Inguva --- libavformat/matroskaenc.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index f731b678b9..88f6c647b9 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -393,6 +393,23 @@ static void put_xiph_size(AVIOContext *pb, int size) * Free the members allocated in the mux context. */ static void mkv_free(MatroskaMuxContext *mkv) { + uint8_t* buf; + if (mkv->dyn_bc) { + avio_close_dyn_buf(mkv->dyn_bc, &buf); + av_free(buf); + } + if (mkv->info_bc) { + avio_close_dyn_buf(mkv->info_bc, &buf); + av_free(buf); + } + if (mkv->tracks_bc) { + avio_close_dyn_buf(mkv->tracks_bc, &buf); + av_free(buf); + } + if (mkv->tags_bc) { + avio_close_dyn_buf(mkv->tags_bc, &buf); + av_free(buf); + } if (mkv->main_seekhead) { av_freep(&mkv->main_seekhead->entries); av_freep(&mkv->main_seekhead);