Tue Apr 20 21:22:38 2010 UTC ()

pkg_install-20100421:
Fix an off-by-one in the check for properly sized pkgdb entries.
It rejected perfectly valid entries.


(joerg)

diff -r1.38 -r1.39 pkgsrc/pkgtools/pkg_install/files/lib/pkgdb.c
diff -r1.154 -r1.155 pkgsrc/pkgtools/pkg_install/files/lib/version.h

--- pkgsrc/pkgtools/pkg_install/files/lib/pkgdb.c 2010/04/14 18:24:58 1.38
+++ pkgsrc/pkgtools/pkg_install/files/lib/pkgdb.c 2010/04/20 21:22:38 1.39

 @@ -1,23 +1,23 @@
-/*	$NetBSD: pkgdb.c,v 1.38 2010/04/14 18:24:58 joerg Exp $	*/
+/*	$NetBSD: pkgdb.c,v 1.39 2010/04/20 21:22:38 joerg Exp $	*/
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: pkgdb.c,v 1.38 2010/04/14 18:24:58 joerg Exp $");
+__RCSID("$NetBSD: pkgdb.c,v 1.39 2010/04/20 21:22:38 joerg Exp $");
 /*-
  * Copyright (c) 1999-2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Hubert Feyrer <hubert@feyrer.de>.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -174,27 +174,27 @@ pkgdb_retrieve(const char *key)
 	if (pkgdbp == NULL)
 		return NULL;
 	keyd.data = __UNCONST(key);
 	keyd.size = strlen(key) + 1;
 	errno = 0;		/* to be sure it's 0 if the key doesn't match anything */
 	vald.data = (void *)NULL;
 	vald.size = 0;
 	status = (*pkgdbp->get) (pkgdbp, &keyd, &vald, 0);
 	if (status)
 		return NULL;
 	eos = memchr(vald.data, 0, vald.size);
-	if (eos == NULL || eos != (char *)vald.data + vald.size) {
+	if (eos == NULL || eos + 1 != (char *)vald.data + vald.size) {
 		if (!corruption_warning) {
 			warnx("pkgdb corrupted, please run ``pkg_admin rebuild''");
 			corruption_warning = 1;
+		}
 		return NULL;
+	}
 	return vald.data;
+}
 /* dump contents of the database to stdout */
 int
 pkgdb_dump(void)

--- pkgsrc/pkgtools/pkg_install/files/lib/version.h 2010/04/20 00:39:13 1.154
+++ pkgsrc/pkgtools/pkg_install/files/lib/version.h 2010/04/20 21:22:38 1.155

 @@ -1,14 +1,14 @@
-/*	$NetBSD: version.h,v 1.154 2010/04/20 00:39:13 joerg Exp $	*/
+/*	$NetBSD: version.h,v 1.155 2010/04/20 21:22:38 joerg Exp $	*/
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -17,16 +17,16 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
-#define PKGTOOLS_VERSION 20100420
+#define PKGTOOLS_VERSION 20100421
 #endif /* _INST_LIB_VERSION_H_ */