diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-06-15 13:19:07 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-06-16 17:55:58 -0700 |
| commit | 4cd008a925f3c7c0064d86a4cb4b06278e79e9e7 (patch) | |
| tree | a67e024b27d62e53a7f430f364daab6af0cc3e60 | |
| parent | Fix ALLOC_GROW off-by-one (diff) | |
| download | tgif-4cd008a925f3c7c0064d86a4cb4b06278e79e9e7.tar.xz | |
pp_header(): work around possible memory corruption
add_user_info() possibly adds way more than just the commit header line.
In fact, it sometimes needs so much more space that there is a buffer
overrun, leading to an ugly crash. For example, the date is printed in its
own line, and usually takes up more space than the equivalent Unix epoch.
So, for good measure, add 80 characters (a full line) to the allocated
space, in addition to the header line length.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | commit.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -997,7 +997,7 @@ static void pp_header(enum cmit_fmt fmt, len = linelen; if (fmt == CMIT_FMT_EMAIL) len = bound_rfc2047(linelen, encoding); - ALLOC_GROW(*buf_p, *ofs_p + len, *space_p); + ALLOC_GROW(*buf_p, *ofs_p + len + 80, *space_p); dst = *buf_p + *ofs_p; *ofs_p += add_user_info("Author", fmt, dst, line + 7, dmode, encoding); @@ -1008,7 +1008,7 @@ static void pp_header(enum cmit_fmt fmt, len = linelen; if (fmt == CMIT_FMT_EMAIL) len = bound_rfc2047(linelen, encoding); - ALLOC_GROW(*buf_p, *ofs_p + len, *space_p); + ALLOC_GROW(*buf_p, *ofs_p + len + 80, *space_p); dst = *buf_p + *ofs_p; *ofs_p += add_user_info("Commit", fmt, dst, line + 10, dmode, encoding); |