Skip to content
Browse files

Merge branch 'jk/pretty-commit-header-incomplete-line' into maint

By Jeff King
* jk/pretty-commit-header-incomplete-line:
  avoid segfault when reading header of malformed commits
  • Loading branch information...
2 parents 92ddfaa + a9c7a8a commit 6c227410b5e1bb014896514f90be55503c4a26c9 @gitster gitster committed Jun 1, 2012
Showing with 4 additions and 1 deletion.
  1. +4 −1 pretty.c
View
5 pretty.c
@@ -439,12 +439,14 @@ static char *get_header(const struct commit *commit, const char *key)
int key_len = strlen(key);
const char *line = commit->buffer;
- for (;;) {
+ while (line) {
const char *eol = strchr(line, '\n'), *next;
if (line == eol)
return NULL;
if (!eol) {
+ warning("malformed commit (header is missing newline): %s",
+ sha1_to_hex(commit->object.sha1));
eol = line + strlen(line);
next = NULL;
} else
@@ -456,6 +458,7 @@ static char *get_header(const struct commit *commit, const char *key)
}
line = next;
}
+ return NULL;
}
static char *replace_encoding_header(char *buf, const char *encoding)

0 comments on commit 6c22741

Please sign in to comment.
Something went wrong with that request. Please try again.