| Marcus Boerger 2005-03-19, 3:55 pm |
| helly Sat Mar 19 09:29:18 2005 EDT
Modified files: (Branch: PHP_5_0)
/ZendEngine2 zend_execute_API.c
Log:
- MFH
http://cvs.php.net/diff.php/ZendEng...1.287.2.11&ty=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.287.2.10 ZendEngine2/zend_execute_API.c:1.287.2.11
--- ZendEngine2/zend_execute_API.c:1.287.2.10 Sun Mar 13 08:24:26 2005
+++ ZendEngine2/zend_execute_API.c Sat Mar 19 09:29:18 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_execute_API.c,v 1.287.2.10 2005/03/13 13:24:26 helly Exp $ */
+/* $Id: zend_execute_API.c,v 1.287.2.11 2005/03/19 14:29:18 helly Exp $ */
#include <stdio.h>
#include <signal.h>
@@ -572,6 +572,10 @@
zval *params_array;
int call_via_handler = 0;
+ if (EG(exception)) {
+ return FAILURE; /* we would result in an instable executor otherwise */
+ }
+
switch (fci->size) {
case sizeof(zend_fcall_info):
break; /* nothing to do currently */
|