Nicholas Miell reported that `git branch -D A B` failed if both refs
A and B were packed into .git/packed-refs. This happens because the
same pack_lock instance was being enqueued into the lock list twice,
causing the linked list to change from a singly linked list with
a NULL at the end to a circularly linked list with no termination.
This resulted in an infinite loop traversing the list during exit.
Signed-off-by: Shawn O. Pearce <spearce@xxxxxxxxxxx>
---
Nicholas Miell <nmiell@xxxxxxxxx> wrote:
> # this is with 1.4.4.2, spearce says master is also affected.
> # (not subscribed, please Cc:)
>
> mkdir test
> cd test
> git init-db
> touch blah
> git add blah
> git commit -m "blah"
> git checkout -b A
> git checkout -b B
> git checkout master
> git pack-refs --all --prune
> git branch -D A B # --> infinite loop in lockfile.c:remove_lock_file()
Fixed. ;-)
Junio, this applies to master, but hopefully could also apply to
maint, as the bug also shows up there.
refs.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/refs.c b/refs.c
index e88ed8b..f1d1a5d 100644
--- a/refs.c
+++ b/refs.c
@@ -709,10 +709,9 @@ struct ref_lock *lock_any_ref_for_update(const char *ref, const unsigned char *o
return lock_ref_sha1_basic(ref, old_sha1, NULL);
}
-static struct lock_file packlock;
-
static int repack_without_ref(const char *refname)
{
+ struct lock_file *packlock;
struct ref_list *list, *packed_ref_list;
int fd;
int found = 0;
@@ -726,8 +725,8 @@ static int repack_without_ref(const char *refname)
}
if (!found)
return 0;
- memset(&packlock, 0, sizeof(packlock));
- fd = hold_lock_file_for_update(&packlock, git_path("packed-refs"), 0);
+ packlock = calloc(1, sizeof(*packlock));
+ fd = hold_lock_file_for_update(packlock, git_path("packed-refs"), 0);
if (fd < 0)
return error("cannot delete '%s' from packed refs", refname);
@@ -744,7 +743,7 @@ static int repack_without_ref(const char *refname)
die("too long a refname '%s'", list->name);
write_or_die(fd, line, len);
}
- return commit_lock_file(&packlock);
+ return commit_lock_file(packlock);
}
int delete_ref(const char *refname, unsigned char *sha1)
--
1.5.0.rc0.gab5a
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html