diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-04-24 08:07:57 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-04-24 08:07:57 +0300 |
commit | 5938454cbc585e0f4bdd9f1cc87c6886a3c1bff3 (patch) | |
tree | 72bb28f592f0b3207fcfb25f243287ca6e4b18c3 /builtin/receive-pack.c | |
parent | 2d646e3e1fd0ae7f525034abee73d06ac8946729 (diff) | |
parent | 5781a9a2703e96b01587bb95ceebcc53f2cee91c (diff) |
Merge branch 'dt/xgethostname-nul-termination'
gethostname(2) may not NUL terminate the buffer if hostname does
not fit; unfortunately there is no easy way to see if our buffer
was too small, but at least this will make sure we will not end up
using garbage past the end of the buffer.
* dt/xgethostname-nul-termination:
xgethostname: handle long hostnames
use HOST_NAME_MAX to size buffers for gethostname(2)
Diffstat (limited to 'builtin/receive-pack.c')
-rw-r--r-- | builtin/receive-pack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 7f484e7f6b..f96834f42c 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -1697,12 +1697,12 @@ static const char *unpack(int err_fd, struct shallow_info *si) if (status) return "unpack-objects abnormal exit"; } else { - char hostname[256]; + char hostname[HOST_NAME_MAX + 1]; argv_array_pushl(&child.args, "index-pack", "--stdin", NULL); push_header_arg(&child.args, &hdr); - if (gethostname(hostname, sizeof(hostname))) + if (xgethostname(hostname, sizeof(hostname))) xsnprintf(hostname, sizeof(hostname), "localhost"); argv_array_pushf(&child.args, "--keep=receive-pack %"PRIuMAX" on %s", |