cvs: php-src /ext/standard proc_open.c

jani Fri Aug 17 10:42:13 2007 UTC Modified files: /php-src/ext/standard proc_open.c Log: - Fixed bug #41904 (proc_open with empty env array) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/proc_open.c?r1=1.57&r2=1.58&diff_format=u Index: php-src/ext/standard/proc_open.c diff -u php-src/ext/standard/proc_open.c:1.57 php-src/ext/standard/proc_open.c:1.58 --- php-src/ext/standard/proc_open.c:1.57 Mon May 28 23:00:25 2007 +++ php-src/ext/standard/proc_open.c Fri Aug 17 10:42:12 2007 @@ -15,7 +15,7 @@ | Author: Wez Furlong <wez@thebrainroom.com> | +----------------------------------------------------------------------+ */ -/* $Id: proc_open.c,v 1.57 2007/05/28 23:00:25 iliaa Exp $ */ +/* $Id: proc_open.c,v 1.58 2007/08/17 10:42:12 jani Exp $ */ #if 0 && (defined(__linux__) || defined(sun) || defined(__IRIX__)) # define _BSD_SOURCE /* linux wants this when XOPEN mode is on */ @@ -95,6 +95,10 @@ cnt = zend_hash_num_elements(Z_ARRVAL_P(environment)); if (cnt < 1) { +#ifndef PHP_WIN32 + env.envarray = (char **) pecalloc(1, sizeof(char *), is_persistent); +#endif + env.envp = (char *) pecalloc(4, 1, is_persistent); return env; }