This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
In Perl_my_clearenv(), under -DPERL_USE_SAFE_PUTENV, don't use
authorNicholas Clark <nick@ccl4.org>
Wed, 17 Oct 2007 16:06:21 +0000 (16:06 +0000)
committerNicholas Clark <nick@ccl4.org>
Wed, 17 Oct 2007 16:06:21 +0000 (16:06 +0000)
strlcpy() to forcibly truncate a string to a known length, when
memcpy() and a write of '\0' will not only make the intent clear, but
also do that exact job more efficiently.

p4raw-id: //depot/perl@32125

util.c

diff --git a/util.c b/util.c
index 83a6709..f75e5a7 100644 (file)
--- a/util.c
+++ b/util.c
@@ -5685,7 +5685,8 @@ Perl_my_clearenv(pTHX)
         bsiz = l + 1; /* + 1 for the \0. */
         buf = (char*)safesysmalloc(bufsiz);
       } 
-      my_strlcpy(buf, *environ, l + 1);
+      memcpy(buf, *environ, l);
+      buf[l] = '\0';
       (void)unsetenv(buf);
     }
     (void)safesysfree(buf);