From owner-p4-projects@FreeBSD.ORG  Mon Apr 12 13:38:03 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DED6C1065679; Mon, 12 Apr 2010 13:38:02 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A30F91065677
	for <perforce@FreeBSD.org>; Mon, 12 Apr 2010 13:38:02 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 912B38FC15
	for <perforce@FreeBSD.org>; Mon, 12 Apr 2010 13:38:02 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3CDc2VF045878
	for <perforce@FreeBSD.org>; Mon, 12 Apr 2010 13:38:02 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3CDc2Rr045876
	for perforce@freebsd.org; Mon, 12 Apr 2010 13:38:02 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Mon, 12 Apr 2010 13:38:02 GMT
Message-Id: <201004121338.o3CDc2Rr045876@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gcooper@FreeBSD.org using -f
From: Garrett Cooper <gcooper@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 176834 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Mon, 12 Apr 2010 13:38:03 -0000

http://p4web.freebsd.org/@@176834?ac=10

Change 176834 by gcooper@gcooper-bayonetta on 2010/04/12 13:37:24

	Avoid a potential segfault because of uninitialized data.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/lib/file.c#12 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/lib/file.c#12 (text+ko) ====

@@ -377,8 +377,14 @@
 	/* int fd = -1; */
 	int r;
 
+	if (pkg == NULL || strcmp(pkg, "-") == 0)
+		pkg_name_humanized = "(stdin)";
+	else
+		pkg_name_humanized = pkg;
+
 	if (Verbose)
-		printf("%s: will extract %s from %s\n", __func__, file, pkg);
+		printf("%s: will extract %s from %s\n",
+		    __func__, file, pkg_name_humanized);
 
 	archive = archive_read_new();
 	archive_read_support_compression_all(archive);