From owner-svn-src-head@FreeBSD.ORG  Tue May 19 14:26:42 2009
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 325421065673;
	Tue, 19 May 2009 14:26:42 +0000 (UTC) (envelope-from flz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 212F28FC15;
	Tue, 19 May 2009 14:26:42 +0000 (UTC) (envelope-from flz@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4JEQgMm000360;
	Tue, 19 May 2009 14:26:42 GMT (envelope-from flz@svn.freebsd.org)
Received: (from flz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4JEQfX1000358;
	Tue, 19 May 2009 14:26:41 GMT (envelope-from flz@svn.freebsd.org)
Message-Id: <200905191426.n4JEQfX1000358@svn.freebsd.org>
From: Florent Thoumie <flz@FreeBSD.org>
Date: Tue, 19 May 2009 14:26:41 +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: r192382 - head/usr.sbin/pkg_install/lib
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: Tue, 19 May 2009 14:26:42 -0000

Author: flz
Date: Tue May 19 14:26:41 2009
New Revision: 192382
URL: http://svn.freebsd.org/changeset/base/192382

Log:
  Skip @pkgdep if there's no argument.
  
  Submitted by:	pav
  MFC after:	1 week

Modified:
  head/usr.sbin/pkg_install/lib/lib.h
  head/usr.sbin/pkg_install/lib/plist.c

Modified: head/usr.sbin/pkg_install/lib/lib.h
==============================================================================
--- head/usr.sbin/pkg_install/lib/lib.h	Tue May 19 14:23:54 2009	(r192381)
+++ head/usr.sbin/pkg_install/lib/lib.h	Tue May 19 14:26:41 2009	(r192382)
@@ -105,7 +105,7 @@
  * Version of the package tools - increase only when some
  * functionality used by bsd.port.mk is changed, added or removed
  */
-#define PKG_INSTALL_VERSION	20090106
+#define PKG_INSTALL_VERSION	20090519
 
 #define PKG_WRAPCONF_FNAME	"/var/db/pkg_install.conf"
 #define main(argc, argv)	real_main(argc, argv)

Modified: head/usr.sbin/pkg_install/lib/plist.c
==============================================================================
--- head/usr.sbin/pkg_install/lib/plist.c	Tue May 19 14:23:54 2009	(r192381)
+++ head/usr.sbin/pkg_install/lib/plist.c	Tue May 19 14:26:41 2009	(r192382)
@@ -285,6 +285,10 @@ read_plist(Package *pkg, FILE *fp)
 	}
 	if (*cp == '\0') {
 	    cp = NULL;
+	    if (cmd == PLIST_PKGDEP) {
+		warnx("corrupted record (pkgdep line without argument), ignoring");
+		cmd = FAIL;
+	    }
 	    goto bottom;
 	}
 	if (cmd == PLIST_COMMENT && sscanf(cp, "PKG_FORMAT_REVISION:%d.%d\n",