[Midnightbsd-cvs] src [10548] trunk/lib/libc/stdlib/getenv.c: merge changes

[laffer1 at midnightbsd.org]

Revision: 10548
          http://svnweb.midnightbsd.org/src/?rev=10548
Author:   laffer1
Date:     2018-06-07 20:43:51 -0400 (Thu, 07 Jun 2018)
Log Message:
-----------
merge changes

Modified Paths:
--------------
    trunk/lib/libc/stdlib/getenv.c

Modified: trunk/lib/libc/stdlib/getenv.c
===================================================================
--- trunk/lib/libc/stdlib/getenv.c	2018-06-07 23:08:06 UTC (rev 10547)
+++ trunk/lib/libc/stdlib/getenv.c	2018-06-08 00:43:51 UTC (rev 10548)
@@ -343,7 +343,7 @@
 	envVarsSize = envVarsTotal * 2;
 
 	/* Create new environment. */
-	envVars = calloc(1, sizeof (*envVars) * envVarsSize);
+	envVars = calloc(envVarsSize, sizeof(*envVars));
 	if (envVars == NULL)
 		goto Failure;
 
@@ -506,9 +506,8 @@
 		envVars[envNdx].valueSize = valueLen;
 
 		/* Save name of name/value pair. */
-		env = stpcpy(envVars[envNdx].name, name);
-		if ((envVars[envNdx].name)[nameLen] != '=')
-			env = stpcpy(env, "=");
+		env = stpncpy(envVars[envNdx].name, name, nameLen);
+		*env++ = '=';
 	}
 	else
 		env = envVars[envNdx].value;