bundle transport: fix an alloc_ref() call
Currently alloc_ref() expects the length of the refname plus 1 as its parameter, prepares that much space and returns a "ref" structure for the caller to fill the refname. One caller in transport.c::get_refs_from_bundle() however allocated one byte less. It may be a good idea to change the calling convention to give alloc_ref() the length of the refname, but that clean-up can be done in a separate patch. This patch only fixes the bug and makes all callers consistent. There was also one overallocation in connect.c, which would not hurt but was wasteful. This patch fixes it as well. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Sep 28, 2007 at 01:46 UTC
90446a0009d9c9c0a06c512f0836e0d30f78d2d0
2 files changed
+3
-3
connect.c
+2
-2
@@ -72,9 +72,9 @@ struct ref **get_remote_heads(int in, struct ref **list,
72
continue;
73
if (nr_match && !path_match(name, nr_match, match))
74
continue;
75
- ref = alloc_ref(len - 40);
75
+ ref = alloc_ref(name_len + 1);
76
hashcpy(ref->old_sha1, old_sha1);
77
- memcpy(ref->name, buffer + 41, len - 40);
77
+ memcpy(ref->name, buffer + 41, name_len + 1);
78
*list = ref;
79
list = &ref->next;
80
}
transport.c
+1
-1
@@ -215,7 +215,7 @@ static struct ref *get_refs_from_bundle(const struct transport *transport)
215
die ("Could not read bundle '%s'.", transport->url);
216
for (i = 0; i < data->header.references.nr; i++) {
217
struct ref_list_entry *e = data->header.references.list + i;
218
- struct ref *ref = alloc_ref(strlen(e->name));
218
+ struct ref *ref = alloc_ref(strlen(e->name) + 1);
219
hashcpy(ref->old_sha1, e->sha1);
220
strcpy(ref->name, e->name);
221
ref->next = result;