development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-06 00:29:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

pp_header(): work around possible memory corruption

Browse source 
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>
This commit is contained in:
Johannes Schindelin 2007-06-15 13:19:07 +01:00 committed by Junio C Hamano
parent c927e6c69b
commit 4cd008a925
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
commit.c
View file

@ -997,7 +997,7 @@ static void pp_header(enum cmit_fmt fmt,
len = linelen; len = linelen;
if (fmt == CMIT_FMT_EMAIL) if (fmt == CMIT_FMT_EMAIL)
len = bound_rfc2047(linelen, encoding); 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; dst = *buf_p + *ofs_p;
*ofs_p += add_user_info("Author", fmt, dst, *ofs_p += add_user_info("Author", fmt, dst,
line + 7, dmode, encoding); line + 7, dmode, encoding);
@ -1008,7 +1008,7 @@ static void pp_header(enum cmit_fmt fmt,
len = linelen; len = linelen;
if (fmt == CMIT_FMT_EMAIL) if (fmt == CMIT_FMT_EMAIL)
len = bound_rfc2047(linelen, encoding); 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; dst = *buf_p + *ofs_p;
*ofs_p += add_user_info("Commit", fmt, dst, *ofs_p += add_user_info("Commit", fmt, dst,
line + 10, dmode, encoding); line + 10, dmode, encoding);