| Marcus Boerger 2004-10-12, 8:55 am |
| helly Tue Oct 12 05:16:18 2004 EDT
Modified files: (Branch: PHP_5_0)
/ZendEngine2 zend_builtin_functions.c
Log:
MFH (add missing check)
http://cvs.php.net/diff.php/ZendEng...=1.239.2.9&ty=u
Index: ZendEngine2/zend_builtin_functions.c
diff -u ZendEngine2/zend_builtin_functions.c:1.239.2.8 ZendEngine2/zend_builtin_functions.c:1.239.2.9
--- ZendEngine2/zend_builtin_functions.c:1.239.2.8 Tue Oct 12 05:14:55 2004
+++ ZendEngine2/zend_builtin_functions.c Tue Oct 12 05:16:17 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_builtin_functions.c,v 1.239.2.8 2004/10/12 09:14:55 helly Exp $ */
+/* $Id: zend_builtin_functions.c,v 1.239.2.9 2004/10/12 09:16:17 helly Exp $ */
#include "zend.h"
#include "zend_API.h"
@@ -1731,6 +1731,11 @@
/* i know this is kinda ugly, but i'm trying to avoid extra cycles in the main execution loop */
zend_bool build_filename_arg = 1;
+ if (!ptr->opline) {
+ /* can happen when calling eval from a custom sapi */
+ function_name = "unknown";
+ build_filename_arg = 0;
+ } else
switch (ptr->opline->op2.u.constant.value.lval) {
case ZEND_EVAL:
function_name = "eval";
|