resolve_ref(): also treat a too-long SHA1 as invalid

mhagger · gitster · commit f989fea0e0b4 · 2011-10-05T13:45:31.000-07:00
If the SHA1 in a reference file is not terminated by a space or
end-of-file, consider it malformed and emit a warning.

Signed-off-by: Michael Haggerty &lt;mhagger@alum.mit.edu&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/refs.c b/refs.c
@@ -593,7 +593,8 @@ const char *resolve_ref(const char *ref, unsigned char *sha1, int reading, int *
 		if (flag)
 			*flag |= REF_ISSYMREF;
 	}
-	if (get_sha1_hex(buffer, sha1)) {
+	/* Please note that FETCH_HEAD has a second line containing other data. */
+	if (get_sha1_hex(buffer, sha1) || (buffer[40] != '\0' && !isspace(buffer[40]))) {
 		warning("reference in %s is formatted incorrectly", path);
 		return NULL;
 	}

Original file line number	Diff line number	Diff line change
`@@ -593,7 +593,8 @@ const char resolve_ref(const char ref, unsigned char sha1, int reading, int `
`593`	`593`	`if (flag)`
`594`	`594`	`*flag \|= REF_ISSYMREF;`
`595`	`595`	`}`
`596`		`- if (get_sha1_hex(buffer, sha1)) {`
	`596`	`+ /* Please note that FETCH_HEAD has a second line containing other data. */`
	`597`	`+ if (get_sha1_hex(buffer, sha1) \|\| (buffer[40] != '\0' && !isspace(buffer[40]))) {`
`597`	`598`	`warning("reference in %s is formatted incorrectly", path);`
`598`	`599`	`return NULL;`
`599`	`600`	`}`