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 2387f4e735e15c95192a82467c778f3ba38f01a0..0baa500cbbda44a6700527d259b26acf6ba92722 100644 (file)
--- 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;
        }