diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-10-26 11:07:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-26 14:05:55 -0700 |
| commit | b8492539f9c078162ee3ae4987ceaa7e7f510c9b (patch) | |
| tree | be85dbe67407e7f4a0cd503607b4b4766c4ca8da | |
| parent | git-daemon: set REMOTE_ADDR to client address (diff) | |
| download | tgif-b8492539f9c078162ee3ae4987ceaa7e7f510c9b.tar.xz | |
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 <gitster@pobox.com>
| -rw-r--r-- | builtin-receive-pack.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/builtin-receive-pack.c b/builtin-receive-pack.c index 45e3cd90fd..9f60f31c2b 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)) |