[PATCH] Fix update-cache --remove fix.

Junio C Hamano· Apr 17, 2005, 08:58 UTC · lore

There is a boundary case bug in the update-cache --remove fix I sent earlier, which results in a segfault when trying to remove a nonexistent name that sorts later than anything in the dircache. Here is a fix.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

 read-cache.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

read-cache.c: 60b8efb3201fbf0a67bef48775bd1c9a1ccae2ff --- read-cache.c +++ read-cache.c 2005-04-17 01:50:00.000000000 -0700

Show changes to diff +2 −1

@@ -371,7 +371,8 @@
 	int pos = cache_name_pos(path, strlen(path));
 	if (pos < 0)
 		pos = -pos-1;
-	while (! strcmp(active_cache[pos]->name, path))
+	while ((pos < active_nr) &&
+	       ! strcmp(active_cache[pos]->name, path))
 		remove_entry_at(pos);
 	return 0;
 }

patchFix update-cache --remove fix.