use strncpy correctly

2 files changed, 6 insertions, 3 deletions

diff --git a/src/lib/libc/net/res_init.c b/src/lib/libc/net/res_init.c
index c925236869..cb60d4c0df 100644
--- a/src/lib/libc/net/res_init.c
+++ b/src/lib/libc/net/res_init.c
@@ -52,7 +52,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: res_init.c,v 1.5 1996/08/25 10:11:02 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: res_init.c,v 1.6 1996/08/27 03:32:53 deraadt Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -131,6 +131,7 @@ res_init()
         /* Allow user to override the local domain definition */
         if (issetugid() == 0 && (cp = getenv("LOCALDOMAIN")) != NULL) {
                 (void)strncpy(_res.defdname, cp, sizeof(_res.defdname) - 1);
+                _res.defdname[sizeof(_res.defdname) - 1] = '\0';
                 if ((cp = strpbrk(_res.defdname, " \t\n")) != NULL)
                         *cp = '\0';
                 haveenv++;
@@ -183,6 +184,7 @@ res_init()
                             continue;
                     (void)strncpy(_res.defdname, cp,
                                   sizeof(_res.defdname) - 1);
+                    _res.defdname[sizeof(_res.defdname) - 1] = '\0';
                     if ((cp = strpbrk(_res.defdname, " \t\n")) != NULL)
                             *cp = '\0';
                     havesearch = 0;
@@ -226,6 +228,7 @@ res_init()
                             continue;
                     (void)strncpy(_res.defdname, cp,
                                   sizeof(_res.defdname) - 1);
+                    _res.defdname[sizeof(_res.defdname) - 1] = '\0';
                     if ((cp = strchr(_res.defdname, '\n')) != NULL)
                             *cp = '\0';
                     /*
diff --git a/src/lib/libc/net/res_query.c b/src/lib/libc/net/res_query.c
index 8fa987ad6b..fb2d22c119 100644
--- a/src/lib/libc/net/res_query.c
+++ b/src/lib/libc/net/res_query.c
@@ -52,7 +52,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: res_query.c,v 1.6 1996/08/24 09:32:20 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: res_query.c,v 1.7 1996/08/27 03:32:54 deraadt Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -379,8 +379,8 @@ __hostalias(name)
                                 break;
                         for (cp2 = cp1 + 1; *cp2 && !isspace(*cp2); ++cp2)
                                 ;
-                        abuf[sizeof(abuf) - 1] = *cp2 = '\0';
                         (void)strncpy(abuf, cp1, sizeof(abuf) - 1);
+                        abuf[sizeof(abuf) - 1] = *cp2 = '\0';
                         fclose(fp);
                         return (abuf);
                 }