From owner-p4-projects@FreeBSD.ORG  Wed Aug 31 13:41:19 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 74FEC16A421; Wed, 31 Aug 2005 13:41:19 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4681416A41F
	for <perforce@freebsd.org>; Wed, 31 Aug 2005 13:41:19 +0000 (GMT)
	(envelope-from soc-andrew@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 13ADC43D45
	for <perforce@freebsd.org>; Wed, 31 Aug 2005 13:41:19 +0000 (GMT)
	(envelope-from soc-andrew@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7VDfIqc094329
	for <perforce@freebsd.org>; Wed, 31 Aug 2005 13:41:18 GMT
	(envelope-from soc-andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7VDfI6o094323
	for perforce@freebsd.org; Wed, 31 Aug 2005 13:41:18 GMT
	(envelope-from soc-andrew@freebsd.org)
Date: Wed, 31 Aug 2005 13:41:18 GMT
Message-Id: <200508311341.j7VDfI6o094323@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-andrew@freebsd.org using -f
From: soc-andrew <soc-andrew@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 82899 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 31 Aug 2005 13:41:20 -0000

http://perforce.freebsd.org/chv.cgi?CH=82899

Change 82899 by soc-andrew@soc-andrew_serv on 2005/08/31 13:40:39

	Fix a seg fault when installing under certain conditions

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/backend/fn_install_freebsd.c#10 edit

Differences ...

==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/backend/fn_install_freebsd.c#10 (text+ko) ====

@@ -204,7 +204,7 @@
 	char base[PATH_MAX];
 	/* This should be big enough as the largest dist name is ~9 */
 	char dist_name[32];
-	void *rk;
+	char *rk;
 	size_t rk_len;
 	int i;
 	struct commands *cmds;
@@ -228,9 +228,10 @@
 	while (!aura_dict_eof(a->dists)) {
 		/* Set dist_name */
 		aura_dict_get_current_key(a->dists, &rk, &rk_len);
+		if (rk_len < 32)
+			rk[rk_len] = '\0';
+
 		strlcpy(dist_name, rk, 32);
-		if (rk_len < 32)
-			dist_name[rk_len] = '\0';
 
 		/* If this dist is special set the correct flag */
 		if (strncmp("src", dist_name, 4) == 0) {