pcntl_exec() should inherit environment in case it's not provided as an argument

1 files changed, 10 insertions, 7 deletions

diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
index bee1693f1d..20f0cd39f2 100755
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@ -727,16 +727,19 @@ PHP_FUNCTION(pcntl_exec)
 			if (return_val == HASH_KEY_IS_LONG) efree(key);
 		}
 		*(pair) = NULL;
-	}
-	
-	if (execve(path, argv, envp) == -1) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error has occured: (errno %d) %s", errno, strerror(errno));
-	}
+
+		if (execve(path, argv, envp) == -1) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error has occured: (errno %d) %s", errno, strerror(errno));
+		}
 	
-	/* Cleanup */
-	if (envp != NULL) {
+		/* Cleanup */
 		for (pair = envp; *pair != NULL; pair++) efree(*pair);
 		efree(envp);
+	} else {
+
+		if (execv(path, argv) == -1) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error has occured: (errno %d) %s", errno, strerror(errno));
+		}
 	}
 
 	efree(argv);