Merge branch 'jc/diffopt'

diff --git a/commit.c b/commit.c
index aa7059c1c6dd7650aa0623443372cfa804a0787c..d01833d8137ece2f4a1d95d8b85d8ed54ecbd16b 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -638,7 +638,9 @@ static char *get_header(const struct commit *commit, const char *key)
                        next = NULL;
                } else
                        next = eol + 1;
-               if (!strncmp(line, key, key_len) && line[key_len] == ' ') {
+               if (eol - line > key_len &&
+                   !strncmp(line, key, key_len) &&
+                   line[key_len] == ' ') {
                        int len = eol - line - key_len;
                        char *ret = xmalloc(len);
                        memcpy(ret, line + key_len + 1, len - 1);