summaryrefslogtreecommitdiffstats
path: root/screen.c
diff options
context:
space:
mode:
authorderaadt <deraadt>2015-01-11 04:14:40 +0000
committerderaadt <deraadt>2015-01-11 04:14:40 +0000
commit8a8e2eb04aa03bd1b8f4a515fc1d7e50a35acb44 (patch)
treefed919d96281e2ff192a51758a70e9cb947b55ca /screen.c
parentaae2b7aa89b80ec6b07a8036f923dc6c8882cfae (diff)
correctly use HOST_NAME_MAX.
Some notes: POSIX HOST_NAME_MAX doesn't include the NUL. POSIX LOGIN_NAME_MAX and TTY_NAME_MAX do include the NUL. BSD MAXHOSTNAMELEN includes the NUL. Actually, most of the historical BSD MAX* defines did include the NUL, except for the historical mistake of utmp fields without NULs in the string, which directly led to strncpy.. just showing how error prone this kind of accounting is. CSRG did right. Somehow POSIX missed the memo on the concepts of carefulness and consistancy, and we are still paying the price when people trip over this. Of course, glibc is even more amazing (that is a hint to blackhats) ok guenther
Diffstat (limited to 'screen.c')
-rw-r--r--screen.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/screen.c b/screen.c
index 3e3cac53..1b841eed 100644
--- a/screen.c
+++ b/screen.c
@@ -31,11 +31,11 @@ void screen_resize_y(struct screen *, u_int);
void
screen_init(struct screen *s, u_int sx, u_int sy, u_int hlimit)
{
- char host[HOST_NAME_MAX];
+ char host[HOST_NAME_MAX+1];
s->grid = grid_create(sx, sy, hlimit);
- if (gethostname(host, HOST_NAME_MAX) == 0)
+ if (gethostname(host, sizeof(host)) == 0)
s->title = xstrdup(host);
else
s->title = xstrdup("");