cvs: ZendEngine2 / zend_execute.c
| From: | Ilia Alshanetsky | Date: | Mon, 12 Jul 2004 17:47:29 +0000 |
| Subject: | cvs: ZendEngine2 / zend_execute.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-2729@lists.php.net to get a copy of this message | ||
iliaa Mon Jul 12 13:47:29 2004 EDT
Modified files:
/ZendEngine2 zend_execute.c
Log:
Fixed bug #29086 & #28064 (PHP crashes on extremly long scripts).
http://cvs.php.net/diff.php/ZendEngine2/zend_execute.c?r1=1.651&r2=1.652&ty=u
Index: ZendEngine2/zend_execute.c
diff -u ZendEngine2/zend_execute.c:1.651 ZendEngine2/zend_execute.c:1.652
--- ZendEngine2/zend_execute.c:1.651 Thu Jun 24 12:35:34 2004
+++ ZendEngine2/zend_execute.c Mon Jul 12 13:47:29 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_execute.c,v 1.651 2004/06/24 16:35:34 pollita Exp $ */
+/* $Id: zend_execute.c,v 1.652 2004/07/12 17:47:29 iliaa Exp $ */
#define ZEND_INTENSIVE_DEBUGGING 0
@@ -1330,7 +1330,7 @@
}
#define RETURN_FROM_EXECUTE_LOOP(execute_data) \
- free_alloca(EX(Ts)); \
+ efree(EX(Ts)); \
EG(in_execution) = EX(original_in_execution); \
EG(current_execute_data) = EX(prev_execute_data); \
return 1; /* CHECK_ME */
@@ -1349,7 +1349,7 @@
/* Initialize execute_data */
EX(fbc) = NULL;
EX(object) = NULL;
- EX(Ts) = (temp_variable *) do_alloca(sizeof(temp_variable)*op_array->T);
+ EX(Ts) = (temp_variable *) safe_emalloc(sizeof(temp_variable), op_array->T, 0);
EX(op_array) = op_array;
EX(original_in_execution) = EG(in_execution);
EX(prev_execute_data) = EG(current_execute_data);