com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/standard/ proc_open.c
| From: | Tjerk Anne Meesters | Date: | Sun, 02 Mar 2014 21:56:22 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/standard/ proc_open.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76311@lists.php.net to get a copy of this message | ||
Commit: bbd0781b3993dc6a06c5706c4a8d0754be0c70b9
Author: Tjerk Meesters <datibbaw@php.net> Mon, 3 Mar 2014 05:56:22 +0800
Parents: 3eb8102348ed63ad82b3a558d0ae1ea6452e0e58 1533f98afddee259444c00a2dea86029002e5cf7
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php..net/?p=php-src.git;a=commitdiff;h=bbd0781b3993dc6a06c5706c4a8d0754be0c70b9
Log:
Merge branch 'PHP-5.4' into PHP-5.5
Changed paths:
MM ext/standard/proc_open.c
Diff:
diff --cc ext/standard/proc_open.c
index 1e37e64,7ffba0e..f4c3b47
--- a/ext/standard/proc_open.c
+++ b/ext/standard/proc_open.c
@@@ -172,9 -188,14 +188,14 @@@ static php_process_env_t _php_array_to_
#endif
p += el_len + 1;
break;
- case HASH_KEY_NON_EXISTANT:
+ case HASH_KEY_NON_EXISTENT:
break;
}
+
+ next_element:
+ if (Z_TYPE_PP(element) != IS_STRING) {
+ zval_dtor(&tmp);
+ }
}
assert((uint)(p - env.envp) <= sizeenv);