cvs: Zend(PHP_4_3) / zend_execute.c
| From: | Ilia Alshanetsky | Date: | Mon, 12 Jul 2004 17:47:32 +0000 |
| Subject: | cvs: Zend(PHP_4_3) / zend_execute.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-2730@lists.php.net to get a copy of this message | ||
iliaa Mon Jul 12 13:47:32 2004 EDT
Modified files: (Branch: PHP_4_3)
/Zend zend_execute.c
Log:
MFZE2: Fixed bug #29086 & #28064 (PHP crashes on extremly long scripts).
http://cvs.php.net/diff.php/Zend/zend_execute.c?r1=1.316.2.37&r2=1.316.2.38&ty=u
Index: Zend/zend_execute.c
diff -u Zend/zend_execute.c:1.316.2.37 Zend/zend_execute.c:1.316.2.38
--- Zend/zend_execute.c:1.316.2.37 Thu Jun 24 12:39:47 2004
+++ Zend/zend_execute.c Mon Jul 12 13:47:32 2004
@@ -1038,7 +1038,7 @@
EX(ce) = NULL;
EX(object).ptr = NULL;
EX(op_array) = op_array;
- 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(prev_execute_data) = EG(current_execute_data);
EX(original_in_execution)=EG(in_execution);
@@ -1757,7 +1757,7 @@
(*EG(return_value_ptr_ptr))->is_ref = 0;
}
}
- free_alloca(EX(Ts));
+ efree(EX(Ts));
EG(in_execution) = EX(original_in_execution);
EG(current_execute_data) = EX(prev_execute_data);
return;