From 5a3a8ec037c9f822703fa1dca42fec808ed37a76 Mon Sep 17 00:00:00 2001 From: Alfred Perlstein Date: Fri, 2 Nov 2012 18:57:38 +0000 Subject: [PATCH] Merge 242488, better use of strlcpy. Submitted by: Eric van Gyzen --- sys/kern/kern_shutdown.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index d6c8b2d4039..788250a0431 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -720,6 +720,7 @@ SYSCTL_STRING(_kern_shutdown, OID_AUTO, dumpdevname, CTLFLAG_RD, int set_dumper(struct dumperinfo *di, const char *devname) { + size_t wantcopy; if (di == NULL) { bzero(&dumper, sizeof dumper); @@ -729,8 +730,8 @@ set_dumper(struct dumperinfo *di, const char *devname) if (dumper.dumper != NULL) return (EBUSY); dumper = *di; - strlcpy(dumpdevname, devname, sizeof(dumpdevname)); - if (strlen(dumpdevname) != strlen(devname)) { + wantcopy = strlcpy(dumpdevname, devname, sizeof(dumpdevname)); + if (wantcopy >= sizeof(dumpdevname)) { printf("set_dumper: device name truncated from '%s' -> '%s'\n", devname, dumpdevname); }