diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-12-26 17:52:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-26 17:52:40 -0800 |
| commit | 49e6be571ecbcc3884bdd2262d974ec9ac051c49 (patch) | |
| tree | d6ffb5c6a627c1b63fe1ef162770f3c57616d3c5 | |
| parent | contrib: resurrect scripted git-revert. (diff) | |
| parent | Make "--pretty=format" parser a bit more careful. (diff) | |
| download | tgif-49e6be571ecbcc3884bdd2262d974ec9ac051c49.tar.xz | |
Merge branch 'rs/pretty-safety'
* rs/pretty-safety:
Make "--pretty=format" parser a bit more careful.
| -rw-r--r-- | pretty.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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; |