From ac9d94f21a7fe47cb6377d2c236084f4f40a52f0 Mon Sep 17 00:00:00 2001
From: itojun <itojun@NetBSD.org>
Date: Wed, 6 Aug 2003 13:43:31 +0000
Subject: [PATCH] use bounded string op and strdup

---
 distrib/utils/libhack/getcap.c | 26 +++++++++++++-------------
 distrib/utils/libhack/yplib.c  |  4 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/distrib/utils/libhack/getcap.c b/distrib/utils/libhack/getcap.c
index 18a8d32803e4..a57c2d40434a 100644
--- a/distrib/utils/libhack/getcap.c
+++ b/distrib/utils/libhack/getcap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: getcap.c,v 1.4 2002/02/02 15:08:06 lukem Exp $	*/
+/*	$NetBSD: getcap.c,v 1.5 2003/08/06 13:43:31 itojun Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -46,7 +46,7 @@
 #if 0
 static char sccsid[] = "@(#)getcap.c	8.3 (Berkeley) 3/25/94";
 #else
-__RCSID("$NetBSD: getcap.c,v 1.4 2002/02/02 15:08:06 lukem Exp $");
+__RCSID("$NetBSD: getcap.c,v 1.5 2003/08/06 13:43:31 itojun Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -112,18 +112,18 @@ cgetset(const char *ent)
 	if (ent == NULL) {
 		if (toprec)
 			free(toprec);
-                toprec = NULL;
-                topreclen = 0;
-                return (0);
-        }
-        topreclen = strlen(ent);
-        if ((toprec = malloc (topreclen + 1)) == NULL) {
+		toprec = NULL;
+		topreclen = 0;
+		return (0);
+	}
+	topreclen = strlen(ent);
+	toprec = strdup(ent);
+	if (toprec == NULL) {
 		errno = ENOMEM;
-                return (-1);
+		return (-1);
 	}
 	gottoprec = 0;
-        (void)strcpy(toprec, ent);	/* XXX: strcpy is safe */
-        return (0);
+	return (0);
 }
 
 /*
@@ -233,9 +233,9 @@ getent(char **cap, size_t *len, char **db_array, int fd, const char *name,
 
 	/*
 	 * Check if we have a top record from cgetset().
-         */
+	 */
 	if (depth == 0 && toprec != NULL && cgetmatch(toprec, name) == 0) {
-		if ((record = malloc (topreclen + BFRAG)) == NULL) {
+		if ((record = malloc(topreclen + BFRAG)) == NULL) {
 			errno = ENOMEM;
 			return (-2);
 		}
diff --git a/distrib/utils/libhack/yplib.c b/distrib/utils/libhack/yplib.c
index da6ed1cb0e6e..3d95083648ae 100644
--- a/distrib/utils/libhack/yplib.c
+++ b/distrib/utils/libhack/yplib.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: yplib.c,v 1.3 1999/09/19 19:51:11 christos Exp $	*/
+/*	$NetBSD: yplib.c,v 1.4 2003/08/06 13:43:32 itojun Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca>
@@ -266,7 +266,7 @@ yperr_string(incode)
 	if (incode == 0)
 		return "Success";
 
-	sprintf(err, "YP FAKE error %d\n", incode);
+	snprintf(err, sizeof(err), "YP FAKE error %d\n", incode);
 	return err;
 }