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>
Junio C Hamano committed
Oct 26, 2008 at 11:07 UTC
b8492539f9c078162ee3ae4987ceaa7e7f510c9b
1 file changed
+7
-2
builtin-receive-pack.c
+7
-2
@@ -466,12 +466,17 @@ static int delete_only(struct command *cmd)
466
467
static int add_refs_from_alternate(struct alternate_object_database *e, void *unused)
468
{
469
- char *other = xstrdup(make_absolute_path(e->base));
470
- size_t len = strlen(other);
469
+ char *other;
470
+ size_t len;
471
struct remote *remote;
472
struct transport *transport;
473
const struct ref *extra;
474
475
+ e->name[-1] = '\0';
476
+ other = xstrdup(make_absolute_path(e->base));
477
+ e->name[-1] = '/';
478
+ len = strlen(other);
479
+
480
while (other[len-1] == '/')
481
other[--len] = '\0';
482
if (len < 8 || memcmp(other + len - 8, "/objects", 8))