From ca7520fe577a6a753fa470189341743ed2e12ebb Mon Sep 17 00:00:00 2001
From: Sean Farley <scf@FreeBSD.org>
Date: Sun, 6 Dec 2009 23:27:24 +0000
Subject: [PATCH] Change the behavior of setenv(), putenv() and unsetenv() to
 continue parsing instead of returning an error if a corrupt (not a
 "name=value" string) entry in the environ array is detected when
 (re)-building the internal environment.  This should prevent applications or
 libraries from experiencing issues arising from the expectation that these
 calls will complete even with corrupt entries.  The behavior is now as it was
 prior to 7.0.

Reviewed by:	jilles
MFC after:	1 week
---
 lib/libc/stdlib/getenv.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/libc/stdlib/getenv.c b/lib/libc/stdlib/getenv.c
index b7826d72a5d4..4617f4551d9e 100644
--- a/lib/libc/stdlib/getenv.c
+++ b/lib/libc/stdlib/getenv.c
@@ -361,8 +361,7 @@ __build_env(void)
 		} else {
 			__env_warnx(CorruptEnvValueMsg, envVars[envNdx].name,
 			    strlen(envVars[envNdx].name));
-			errno = EFAULT;
-			goto Failure;
+			continue;
 		}
 
 		/*
@@ -377,8 +376,7 @@ __build_env(void)
 		    false) == NULL) {
 			__env_warnx(CorruptEnvFindMsg, envVars[envNdx].name,
 			    nameLen);
-			errno = EFAULT;
-			goto Failure;
+			continue;
 		}
 		envVars[activeNdx].active = true;
 	}
@@ -560,8 +558,7 @@ __merge_environ(void)
 				if ((equals = strchr(*env, '=')) == NULL) {
 					__env_warnx(CorruptEnvValueMsg, *env,
 					    strlen(*env));
-					errno = EFAULT;
-					return (-1);
+					continue;
 				}
 				if (__setenv(*env, equals - *env, equals + 1,
 				    1) == -1)