diff options
| author | David Turner <dturner@twosigma.com> | 2017-04-18 17:57:43 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-18 19:58:04 -0700 |
| commit | 5781a9a2703e96b01587bb95ceebcc53f2cee91c (patch) | |
| tree | a0c233542e0d0e694a699f191a16c358d7415122 /builtin | |
| parent | da25bdb7766c01665500cf7c7b75e76ea1f28b49 (diff) | |
| download | git-5781a9a2703e96b01587bb95ceebcc53f2cee91c.tar.gz | |
xgethostname: handle long hostnamesdt/xgethostname-nul-termination
If the full hostname doesn't fit in the buffer supplied to
gethostname, POSIX does not specify whether the buffer will be
null-terminated, so to be safe, we should do it ourselves. Introduce
new function, xgethostname, which ensures that there is always a \0
at the end of the buffer.
Signed-off-by: David Turner <dturner@twosigma.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/gc.c | 2 | ||||
| -rw-r--r-- | builtin/receive-pack.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/gc.c b/builtin/gc.c index 5befd518fd..4f85610d87 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -232,7 +232,7 @@ static const char *lock_repo_for_gc(int force, pid_t* ret_pid) /* already locked */ return NULL; - if (gethostname(my_host, sizeof(my_host))) + if (xgethostname(my_host, sizeof(my_host))) xsnprintf(my_host, sizeof(my_host), "unknown"); pidfile_path = git_pathdup("gc.pid"); diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 3ca8ebe0e1..eee5faaa24 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -1660,7 +1660,7 @@ static const char *unpack(int err_fd, struct shallow_info *si) argv_array_pushl(&child.args, "index-pack", "--stdin", hdr_arg, NULL); - 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", |