Date: Tue, 19 May 2009 14:26:41 +0000 (UTC) From: Florent Thoumie <flz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r192382 - head/usr.sbin/pkg_install/lib Message-ID: <200905191426.n4JEQfX1000358@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905191426.n4JEQfX1000358>