From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Thu, 15 Sep 2011 21:10:41 +0000 (+0200)
Subject: resolve_ref(): also treat a too-long SHA1 as invalid
X-Git-Tag: v1.7.8-rc0~19^2~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f989fea0e0b47873de62a355f4766f03a88fb01b;p=git.git

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

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 <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/refs.c b/refs.c
index 2387f4e73..0baa500cb 100644
--- 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;
 	}