From owner-svn-src-all@FreeBSD.ORG  Mon Nov 28 05:34:16 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A3F401065670;
	Mon, 28 Nov 2011 05:34:16 +0000 (UTC)
	(envelope-from kevlo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 92F228FC0C;
	Mon, 28 Nov 2011 05:34:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAS5YGdm073366;
	Mon, 28 Nov 2011 05:34:16 GMT (envelope-from kevlo@svn.freebsd.org)
Received: (from kevlo@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAS5YGvh073362;
	Mon, 28 Nov 2011 05:34:16 GMT (envelope-from kevlo@svn.freebsd.org)
Message-Id: <201111280534.pAS5YGvh073362@svn.freebsd.org>
From: Kevin Lo <kevlo@FreeBSD.org>
Date: Mon, 28 Nov 2011 05:34:16 +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: r228048 - in head/usr.sbin/bsdinstall: distextract
	distfetch partedit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Nov 2011 05:34:16 -0000

Author: kevlo
Date: Mon Nov 28 05:34:16 2011
New Revision: 228048
URL: http://svn.freebsd.org/changeset/base/228048

Log:
  Plug memory leaks and fix open(2) error check.
  
  Reviewed by:	nwhitehorn
  MFC after:	3 days

Modified:
  head/usr.sbin/bsdinstall/distextract/distextract.c
  head/usr.sbin/bsdinstall/distfetch/distfetch.c
  head/usr.sbin/bsdinstall/partedit/gpart_ops.c

Modified: head/usr.sbin/bsdinstall/distextract/distextract.c
==============================================================================
--- head/usr.sbin/bsdinstall/distextract/distextract.c	Sun Nov 27 23:31:22 2011	(r228047)
+++ head/usr.sbin/bsdinstall/distextract/distextract.c	Mon Nov 28 05:34:16 2011	(r228048)
@@ -49,6 +49,7 @@ main(void)
 	dists = calloc(ndists, sizeof(const char *));
 	if (dists == NULL) {
 		fprintf(stderr, "Out of memory!\n");
+		free(diststring);
 		return (1);
 	}
 

Modified: head/usr.sbin/bsdinstall/distfetch/distfetch.c
==============================================================================
--- head/usr.sbin/bsdinstall/distfetch/distfetch.c	Sun Nov 27 23:31:22 2011	(r228047)
+++ head/usr.sbin/bsdinstall/distfetch/distfetch.c	Mon Nov 28 05:34:16 2011	(r228048)
@@ -48,6 +48,7 @@ main(void)
 	urls = calloc(ndists, sizeof(const char *));
 	if (urls == NULL) {
 		fprintf(stderr, "Out of memory!\n");
+		free(diststring);
 		return (1);
 	}
 

Modified: head/usr.sbin/bsdinstall/partedit/gpart_ops.c
==============================================================================
--- head/usr.sbin/bsdinstall/partedit/gpart_ops.c	Sun Nov 27 23:31:22 2011	(r228047)
+++ head/usr.sbin/bsdinstall/partedit/gpart_ops.c	Mon Nov 28 05:34:16 2011	(r228048)
@@ -301,7 +301,7 @@ gpart_bootcode(struct ggeom *gp)
 		return;
 
 	bootfd = open(bootcode, O_RDONLY);
-	if (bootfd <= 0) {
+	if (bootfd < 0) {
 		dialog_msgbox("Bootcode Error", strerror(errno), 0, 0,
 		    TRUE);
 		return;