From owner-svn-src-head@FreeBSD.ORG  Wed Jun  2 17:17:11 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 68AAD1065675;
	Wed,  2 Jun 2010 17:17:11 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4EB298FC20;
	Wed,  2 Jun 2010 17:17:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o52HHBti017376;
	Wed, 2 Jun 2010 17:17:11 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o52HHB9V017373;
	Wed, 2 Jun 2010 17:17:11 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201006021717.o52HHB9V017373@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Wed, 2 Jun 2010 17:17:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208746 - head/sys/geom/part
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Jun 2010 17:17:11 -0000

Author: marius
Date: Wed Jun  2 17:17:11 2010
New Revision: 208746
URL: http://svn.freebsd.org/changeset/base/208746

Log:
  Don't leak memory on destruction.
  
  Reviewed by:	marcel
  MFC after:	3 days

Modified:
  head/sys/geom/part/g_part_bsd.c
  head/sys/geom/part/g_part_gpt.c

Modified: head/sys/geom/part/g_part_bsd.c
==============================================================================
--- head/sys/geom/part/g_part_bsd.c	Wed Jun  2 15:46:37 2010	(r208745)
+++ head/sys/geom/part/g_part_bsd.c	Wed Jun  2 17:17:11 2010	(r208746)
@@ -240,6 +240,12 @@ g_part_bsd_create(struct g_part_table *b
 static int
 g_part_bsd_destroy(struct g_part_table *basetable, struct g_part_parms *gpp)
 {
+	struct g_part_bsd_table *table;
+
+	table = (struct g_part_bsd_table *)basetable;
+	if (table->bbarea != NULL)
+		g_free(table->bbarea);
+	table->bbarea = NULL;
 
 	/* Wipe the second sector to clear the partitioning. */
 	basetable->gpt_smhead |= 2;

Modified: head/sys/geom/part/g_part_gpt.c
==============================================================================
--- head/sys/geom/part/g_part_gpt.c	Wed Jun  2 15:46:37 2010	(r208745)
+++ head/sys/geom/part/g_part_gpt.c	Wed Jun  2 17:17:11 2010	(r208746)
@@ -486,6 +486,12 @@ g_part_gpt_create(struct g_part_table *b
 static int
 g_part_gpt_destroy(struct g_part_table *basetable, struct g_part_parms *gpp)
 {
+	struct g_part_gpt_table *table;
+
+	table = (struct g_part_gpt_table *)basetable;
+	if (table->hdr != NULL)
+		g_free(table->hdr);
+	table->hdr = NULL;
 
 	/*
 	 * Wipe the first 2 sectors as well as the last to clear the