diff options
| author | Florent Thoumie <flz@FreeBSD.org> | 2009-05-19 14:26:41 +0000 |
|---|---|---|
| committer | Florent Thoumie <flz@FreeBSD.org> | 2009-05-19 14:26:41 +0000 |
| commit | aa33fa5a86d23e2989f02686d22227a5ca690a3e (patch) | |
| tree | ffdd19da592462fc4ad418a215097fa0dc0b6574 | |
| parent | 05e605b7649eaa47028b444ece1800b5ed11e6e5 (diff) | |
Notes
| -rw-r--r-- | usr.sbin/pkg_install/lib/lib.h | 2 | ||||
| -rw-r--r-- | usr.sbin/pkg_install/lib/plist.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/usr.sbin/pkg_install/lib/lib.h b/usr.sbin/pkg_install/lib/lib.h index 422912e8d4a71..aef772bdbcc68 100644 --- a/usr.sbin/pkg_install/lib/lib.h +++ b/usr.sbin/pkg_install/lib/lib.h @@ -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) diff --git a/usr.sbin/pkg_install/lib/plist.c b/usr.sbin/pkg_install/lib/plist.c index 283b87f9c1b1f..3c87d629c1fee 100644 --- a/usr.sbin/pkg_install/lib/plist.c +++ b/usr.sbin/pkg_install/lib/plist.c @@ -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", |