Module Name: src
Committed By: sjg
Date: Thu Nov 14 00:27:05 UTC 2013
Modified Files:
src/usr.bin/make: hash.c
Log Message:
Don't SEGV when Hash_Table is uninitialized
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/make/hash.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/hash.c
diff -u src/usr.bin/make/hash.c:1.19 src/usr.bin/make/hash.c:1.20
--- src/usr.bin/make/hash.c:1.19 Sat Jan 24 10:59:09 2009
+++ src/usr.bin/make/hash.c Thu Nov 14 00:27:05 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: hash.c,v 1.19 2009/01/24 10:59:09 dsl Exp $ */
+/* $NetBSD: hash.c,v 1.20 2013/11/14 00:27:05 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: hash.c,v 1.19 2009/01/24 10:59:09 dsl Exp $";
+static char rcsid[] = "$NetBSD: hash.c,v 1.20 2013/11/14 00:27:05 sjg Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)hash.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: hash.c,v 1.19 2009/01/24 10:59:09 dsl Exp $");
+__RCSID("$NetBSD: hash.c,v 1.20 2013/11/14 00:27:05 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -221,6 +221,9 @@ Hash_FindEntry(Hash_Table *t, const char
unsigned h;
const char *p;
+ if (t == NULL || t->bucketPtr == NULL) {
+ return NULL;
+ }
for (h = 0, p = key; *p;)
h = (h << 5) - h + *p++;
p = key;
