RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MINOR] force null-termination of hostname 

Marcello Gorlani reported that at least on FreeBSD, a long hostname
was reported with garbage on the stats page. POSIX does not make it
mandatory for gethostname() to NULL-terminate the string in case of
truncation, and at least FreeBSD appears not to do it. So let's
force null-termination to keep safe.
This commit is contained in:
Willy Tarreau 2010-03-12 21:58:54 +01:00
parent 78caf8449d
commit 1d21e0a28e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/haproxy.c
View File

@ -147,7 +147,7 @@ const int zero = 0;
const int one = 1;
const struct linger nolinger = { .l_onoff = 1, .l_linger = 0 };
char hostname[MAX_HOSTNAME_LEN] = "";
char hostname[MAX_HOSTNAME_LEN];
/*********************************************************************/
@ -542,7 +542,12 @@ void init(int argc, char **argv)
if (LIST_ISEMPTY(&cfg_cfgfiles))
usage(old_argv);
gethostname(hostname, MAX_HOSTNAME_LEN);
/* NB: POSIX does not make it mandatory for gethostname() to NULL-terminate
* the string in case of truncation, and at least FreeBSD appears not to do
* it.
*/
memset(hostname, 0, sizeof(hostname));
gethostname(hostname, sizeof(hostname) - 1);
have_appsession = 0;
global.maxsock = 10; /* reserve 10 fds ; will be incremented by socket eaters */