From: Dmitry Stogov Date: Wed, 30 Sep 2009 13:04:28 +0000 (+0000) Subject: pcntl_exec() should inherit environment in case it's not provided as an argument X-Git-Tag: php-5.3.2RC1~417 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a535b807c14649ceb5c01a04a21931fc8ca7303;p=php pcntl_exec() should inherit environment in case it's not provided as an argument --- 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);