Tue Nov 17 20:19:55 2015 UTC ()

PR/50441: Manuel Bouyer: hash seq enumeration skips keys on big data.
XXX: pullup-7


(christos)

diff -r1.35 -r1.36 src/lib/libc/db/hash/hash.c

--- src/lib/libc/db/hash/hash.c 2015/06/22 21:16:02	1.35
+++ src/lib/libc/db/hash/hash.c 2015/11/17 20:19:55	1.36

 @@ -1,14 +1,14 @@
-/*	$NetBSD: hash.c,v 1.35 2015/06/22 21:16:02 christos Exp $	*/
+/*	$NetBSD: hash.c,v 1.36 2015/11/17 20:19:55 christos Exp $	*/
 /*-
  * Copyright (c) 1990, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Margo Seltzer.
+ *
  * 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.
 @@ -27,27 +27,27 @@
  * 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.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: hash.c,v 1.35 2015/06/22 21:16:02 christos Exp $");
+__RCSID("$NetBSD: hash.c,v 1.36 2015/11/17 20:19:55 christos Exp $");
 #include "namespace.h"
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <assert.h>
 @@ -760,27 +760,27 @@ next_bucket:
 				hashp->cbucket = -1;
 				return (ABNORMAL);
+			}
 			if (hashp->cndx == -1) {
 				/* move to the last element of the page */
 				hashp->cndx = 1;
 				while (bp[hashp->cndx - 1] != 0)
 					hashp->cndx += 2;
 			} else {
 				/* start on the first element */
 				hashp->cndx = 1;
+			}
 		} else {
-			bp = (uint16_t *)(void *)hashp->cpage->page;
+			bp = (uint16_t *)(void *)bufp->page;
 			if (flag == R_NEXT || flag == 0) {
 				if (hashp->cndx > bp[0]) {
 					hashp->cpage = NULL;
 					hashp->cbucket++;
 					hashp->cndx = 1;
 					goto next_bucket;
+				}
+			}
+		}
 		_DIAGASSERT(bp != NULL);
 		_DIAGASSERT(bufp != NULL);
 @@ -792,35 +792,36 @@ next_bucket:
 				return (ERROR);
 			bp = (uint16_t *)(void *)(bufp->page);
 			hashp->cndx = 1;
+		}
 		if (!bp[0]) {
 			hashp->cpage = NULL;
 			++hashp->cbucket;
+		}
+	}
 	ndx = hashp->cndx;
 	if (bp[ndx + 1] < REAL_KEY) {
 		if (__big_keydata(hashp, bufp, key, data, 1))
 			return (ERROR);
 		hashp->cndx = 1;
 	} else {
 		if (hashp->cpage == NULL)
 			return (ERROR);
 		key->data = (uint8_t *)hashp->cpage->page + bp[ndx];
 		key->size = (ndx > 1 ? bp[ndx - 1] : hashp->BSIZE) - bp[ndx];
 		data->data = (uint8_t *)hashp->cpage->page + bp[ndx + 1];
 		data->size = bp[ndx] - bp[ndx + 1];
 		hashp->cndx += 2;
+	}
 	hashp->cndx += 2;
 	return (SUCCESS);
+}
 /********************************* UTILITIES ************************/
 /*
  * Returns:
  *	 0 ==> OK
  *	-1 ==> Error
  */
 int
 __expand_table(HTAB *hashp)
+{