cvs: php-src(PHP_5_2) /ext/standard proc_open.c

jani Fri Aug 17 10:42:30 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard proc_open.c Log: MFH:- Fixed bug #41904 (proc_open with empty env array) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/proc_open.c?r1=1.36.2.1.2.15&r2=1.36.2.1.2.16&diff_format=u Index: php-src/ext/standard/proc_open.c diff -u php-src/ext/standard/proc_open.c:1.36.2.1.2.15 php-src/ext/standard/proc_open.c:1.36.2.1.2.16 --- php-src/ext/standard/proc_open.c:1.36.2.1.2.15 Mon Apr 16 08:09:55 2007 +++ php-src/ext/standard/proc_open.c Fri Aug 17 10:42:30 2007 @@ -15,7 +15,7 @@ | Author: Wez Furlong <wez@thebrainroom.com> | +----------------------------------------------------------------------+ */ -/* $Id: proc_open.c,v 1.36.2.1.2.15 2007/04/16 08:09:55 dmitry Exp $ */ +/* $Id: proc_open.c,v 1.36.2.1.2.16 2007/08/17 10:42:30 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; }