mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-19 04:04:17 +01:00
Code

Merge branch 'rs/pretty-safety'

Browse Source 
* rs/pretty-safety:
  Make "--pretty=format" parser a bit more careful.
This commit is contained in:
Junio C Hamano 2007-12-26 17:52:40 -08:00
commit 49e6be571e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pretty.c
View File

@ -412,7 +412,7 @@ static void parse_commit_header(struct format_commit_context *context)
if (i == eol) {
state++;
/* strip empty lines */
while (msg[eol + 1] == '\n')
while (msg[eol] == '\n' && msg[eol + 1] == '\n')
eol++;
} else if (!prefixcmp(msg + i, "author ")) {
context->author.off = i + 7;
@ -425,6 +425,8 @@ static void parse_commit_header(struct format_commit_context *context)
context->encoding.len = eol - i - 9;
}
i = eol;
if (!msg[i])
break;
}
context->body_off = i;
context->commit_header_parsed = 1;