mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

receive-pack: fix "borrowing from alternate object store" implementation

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2008-10-26 11:07:18 -07:00
parent 53ffb878a9
commit b8492539f9
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
builtin-receive-pack.c
View File

@ -466,12 +466,17 @@ static int delete_only(struct command *cmd)
static int add_refs_from_alternate(struct alternate_object_database *e, void *unused) static int add_refs_from_alternate(struct alternate_object_database *e, void *unused)
{ {
char *other = xstrdup(make_absolute_path(e->base)); char *other;
size_t len = strlen(other); size_t len;
struct remote *remote; struct remote *remote;
struct transport *transport; struct transport *transport;
const struct ref *extra; 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] == '/') while (other[len-1] == '/')
other[--len] = '\0'; other[--len] = '\0';
if (len < 8 || memcmp(other + len - 8, "/objects", 8)) if (len < 8 || memcmp(other + len - 8, "/objects", 8))