From: Johannes Sixt <j6t@kdbg.org>
Date: Tue, 1 Nov 2011 22:21:06 +0000 (+0100)
Subject: name-hash.c: always initialize dir_next pointer
X-Git-Tag: v1.7.8-rc1~10^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=395c73560b3716a1f74124826b80ab7ec47d7cd8;p=git.git

name-hash.c: always initialize dir_next pointer

Test t2021-checkout-overwrite.sh reveals a segfault in 'git add' on a
case-insensitive file system when git is compiled with XMALLOC_POISON
defined. The reason is that 2548183b (fix phantom untracked files when
core.ignorecase is set) added a new member dir_next to struct cache_entry,
but forgot to initialize it in all cases.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/name-hash.c b/name-hash.c
index 225dd7699..d8d25c23e 100644
--- a/name-hash.c
+++ b/name-hash.c
@@ -74,7 +74,7 @@ static void hash_index_entry(struct index_state *istate, struct cache_entry *ce)
 	if (ce->ce_flags & CE_HASHED)
 		return;
 	ce->ce_flags |= CE_HASHED;
-	ce->next = NULL;
+	ce->next = ce->dir_next = NULL;
 	hash = hash_name(ce->name, ce_namelen(ce));
 	pos = insert_hash(hash, ce, &istate->name_hash);
 	if (pos) {