development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-17 11:07:55 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

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

Browse source 
Fixes error codepath when a malformed commit object has a header line
chomped in the middle.
This commit is contained in:
Junio C Hamano 2012-05-25 12:05:35 -07:00
parent 500cf7cbb4 a9c7a8a8be
commit 407abbabe5
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pretty.c
View file

@ -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)