kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

parse_fetch: convert to use struct object_id 

Convert the parse_fetch function to use struct object_id.  Remove the
strlen check as get_oid_hex will fail safely on receiving a too-short
NUL-terminated string.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Jeff King <peff@peff.net>
maint
brian m. carlson 2015-11-10 02:22:22 +00:00 committed by Jeff King
parent 854ecb9cad
commit 8338c911d1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
remote-curl.c
View File

@ -803,19 +803,19 @@ static void parse_fetch(struct strbuf *buf)
if (skip_prefix(buf->buf, "fetch ", &p)) { if (skip_prefix(buf->buf, "fetch ", &p)) {
const char *name; const char *name;
struct ref *ref; struct ref *ref;
unsigned char old_sha1[20]; struct object_id old_oid;


if (strlen(p) < 40 || get_sha1_hex(p, old_sha1)) if (get_oid_hex(p, &old_oid))
die("protocol error: expected sha/ref, got %s'", p); die("protocol error: expected sha/ref, got %s'", p);
if (p[40] == ' ') if (p[GIT_SHA1_HEXSZ] == ' ')
name = p + 41; name = p + GIT_SHA1_HEXSZ + 1;
else if (!p[40]) else if (!p[GIT_SHA1_HEXSZ])
name = ""; name = "";
else else
die("protocol error: expected sha/ref, got %s'", p); die("protocol error: expected sha/ref, got %s'", p);


ref = alloc_ref(name); ref = alloc_ref(name);
hashcpy(ref->old_oid.hash, old_sha1); oidcpy(&ref->old_oid, &old_oid);


*list = ref; *list = ref;
list = &ref->next; list = &ref->next;