From: Junio C Hamano Date: Sun, 26 Oct 2008 18:07:18 +0000 (-0700) Subject: receive-pack: fix "borrowing from alternate object store" implementation X-Git-Tag: v1.6.1-rc1~108 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b8492539f9c078162ee3ae4987ceaa7e7f510c9b;p=git.git receive-pack: fix "borrowing from alternate object store" implementation In the alternate_object_database structure, ent->base[] is a buffer the users can use to form pathnames to loose objects, and ent->name is a pointer into that buffer (it points at one beyond ".git/objects/"). If you get a call to add_refs_from_alternate() after somebody used the entry (has_loose_object() has been called, for example), *ent->name would not be NUL, and ent->base[] won't be the path to the object store. This caller is expecting to read the path to the object store in ent->base[]; it needs to NUL terminate the buffer if it wants to. Signed-off-by: Junio C Hamano --- diff --git a/builtin-receive-pack.c b/builtin-receive-pack.c index 45e3cd90f..9f60f31c2 100644 --- a/builtin-receive-pack.c +++ b/builtin-receive-pack.c @@ -466,12 +466,17 @@ static int delete_only(struct command *cmd) static int add_refs_from_alternate(struct alternate_object_database *e, void *unused) { - char *other = xstrdup(make_absolute_path(e->base)); - size_t len = strlen(other); + char *other; + size_t len; struct remote *remote; struct transport *transport; const struct ref *extra; + e->name[-1] = '\0'; + other = xstrdup(make_absolute_path(e->base)); + e->name[-1] = '/'; + len = strlen(other); + while (other[len-1] == '/') other[--len] = '\0'; if (len < 8 || memcmp(other + len - 8, "/objects", 8))