Merge branch 'jc/oneline'
* jc/oneline: pp_header(): work around possible memory corruption
This commit is contained in:
commit
4d9b580763
4
commit.c
4
commit.c
@ -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);
|
||||||
|
Loading…
Reference in New Issue
Block a user