From f5700d5db39e8d77b5f8d937580dcb01fe9f6a35 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 24 Jun 2012 23:09:10 +0200 Subject: [PATCH] ttyname_r: Fix result on OSF/1, Solaris. * lib/ttyname_r.c (ttyname_r): Produce a NUL-terminated result. --- ChangeLog | 5 +++++ lib/ttyname_r.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 08131d3c9..94e8a4148 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2012-06-24 Bruno Haible + ttyname_r: Fix result on OSF/1, Solaris. + * lib/ttyname_r.c (ttyname_r): Produce a NUL-terminated result. + +2012-06-24 Bruno Haible + ptsname_r: Add support for Solaris. * lib/ptsname_r.c (__ptsname_r): Add a different implementation for Solaris. diff --git a/lib/ttyname_r.c b/lib/ttyname_r.c index 6005c9d8d..19c6b0d02 100644 --- a/lib/ttyname_r.c +++ b/lib/ttyname_r.c @@ -45,7 +45,7 @@ ttyname_r (int fd, char *buf, size_t buflen) return err; if (buflen < sizeof (largerbuf)) { - size_t namelen = strlen (largerbuf); + size_t namelen = strlen (largerbuf) + 1; if (namelen > buflen) return ERANGE; memcpy (buf, largerbuf, namelen); -- 2.11.0