cvs: php-src(PHP_5_3) /ext/standard exec.c
| From: | Felipe Pena | Date: | Thu, 16 Oct 2008 13:00:27 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/standard exec.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-53543@lists.php.net to get a copy of this message | ||
felipe Thu Oct 16 13:00:27 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard exec.c
Log:
- Revert
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/exec.c?r1=1.113.2.3.2.1.2.13&r2=1.113.2.3.2.1.2.14&diff_format=u
Index: php-src/ext/standard/exec.c
diff -u php-src/ext/standard/exec.c:1.113.2.3.2.1.2.13
php-src/ext/standard/exec.c:1.113.2.3.2.1.2.14
--- php-src/ext/standard/exec.c:1.113.2.3.2.1.2.13 Thu Oct 16 11:59:37 2008
+++ php-src/ext/standard/exec.c Thu Oct 16 13:00:27 2008
@@ -16,7 +16,7 @@
| Ilia Alshanetsky <iliaa@php.net> |
+----------------------------------------------------------------------+
*/
-/* $Id: exec.c,v 1.113.2.3.2.1.2.13 2008/10/16 11:59:37 indeyets Exp $ */
+/* $Id: exec.c,v 1.113.2.3.2.1.2.14 2008/10/16 13:00:27 felipe Exp $ */
#include <stdio.h>
#include "php.h"
@@ -269,6 +269,8 @@
char *p = NULL;
size_t estimate = (2 * l) + 1;
+ TSRMLS_FETCH();
+
cmd = safe_emalloc(2, l, 1);
for (x = 0, y = 0; x < l; x++) {
@@ -357,6 +359,8 @@
char *cmd;
size_t estimate = (4 * l) + 3;
+ TSRMLS_FETCH();
+
cmd = safe_emalloc(4, l, 3); /* worst case */
#ifdef PHP_WIN32