From owner-p4-projects@FreeBSD.ORG  Fri May 28 11:17:09 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4439A1065674; Fri, 28 May 2010 11:17:09 +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 08C801065670
	for <perforce@FreeBSD.org>; Fri, 28 May 2010 11:17:09 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EABEF8FC08
	for <perforce@FreeBSD.org>; Fri, 28 May 2010 11:17:08 +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 o4SBH8Pa028164
	for <perforce@FreeBSD.org>; Fri, 28 May 2010 11:17:08 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4SBH8vI028162
	for perforce@freebsd.org; Fri, 28 May 2010 11:17:08 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Fri, 28 May 2010 11:17:08 GMT
Message-Id: <201005281117.o4SBH8vI028162@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 178919 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: Fri, 28 May 2010 11:17:09 -0000

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

Change 178919 by gcooper@gcooper-bayonetta on 2010/05/28 11:16:18

	Puke on bad plist info.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/plist.c#7 edit
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/info/perform.c#9 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/plist.c#7 (text+ko) ====

@@ -361,6 +361,7 @@
 					if (cmd == PLIST_PKGDEP) {
 						warnx("corrupted record (pkgdep line "
 						    "without argument), ignoring");
+						errno = EINVAL;
 						cmd = rc = -1;
 					}
 

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/info/perform.c#9 (text+ko) ====

@@ -22,7 +22,9 @@
 __FBSDID("$FreeBSD: src/usr.sbin/pkg_install/info/perform.c,v 1.57 2010/04/23 11:07:43 flz Exp $");
 
 #include <err.h>
+#include <errno.h>
 #include <fcntl.h>
+#include <string.h>
 
 #include <pkg.h>
 #include "cleanup.h"
@@ -41,7 +43,8 @@
 {
     char **matched;
     int err_cnt = 0;
-    int i, errcode;
+    int errcode;
+    int i;
 
     if (register_cleanup_handler(cleanup, NULL, NULL, 0) == -1)
 	err(EXIT_FAILURE, "failed to initialize exit handler");
@@ -99,6 +102,8 @@
     const char *cp = NULL;
     int code = 0;
     int fd = -1;
+    int rc;
+    int serrno;
 
     if (isURL(pkg)) {
 	if ((cp = fileGetURL(NULL, pkg, KeepPackage)) != NULL) {
@@ -181,8 +186,11 @@
 	goto bail;
     }
     /* If we have a prefix, add it now */
-    read_plist(&plist, fd);
-    close(fd);
+    rc = read_plist(&plist, fd);
+    serrno = errno;
+    (void) close(fd);
+    if (rc == -1)
+	errx(EXIT_FAILURE, "failure reading plist: %s", strerror(serrno));
 
     /*
      * Index is special info type that has to override all others to make