[PATCH] include_once/require_once core dump
| From: | Brian J. France | Date: | Tue, 20 May 2003 00:31:23 +0000 |
| Subject: | [PATCH] include_once/require_once core dump | ||
| Groups: | php.internals | ||
| Request: | Send a blank email to internals+get-1746@lists.php.net to get a copy of this message | ||
Can somebody with karma check in the following patch?
If zend_open fails for require_once or include_oncde, file_handle is
not defined and can't be used for the error/warning message.
Changed to inc_filename->value.str.val which is what is passed to zend_open.
Thanks,
Brian
Index: zend_execute.c =================================================================== RCS file: /repository/Zend/zend_execute.c,v retrieving revision 1.316.2.8 diff -u -p -r1.316.2.8 zend_execute.c --- zend_execute.c 17 May 2003 07:49:29 -0000 1.316.2.8 +++ zend_execute.c 20 May 2003 00:27:05 -0000 @@ -2123,9 +2123,9 @@ send_by_ref: } } else { if (EX(opline)->op2.u.constant.value.lval==ZEND_INCLUDE_ONCE) { - zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file_handle.filename); + zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, inc_filename->value..str.val); } else { - zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, file_handle.filename); + zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, inc_filename->value..str.val); } } break;
Index: zend_execute.c =================================================================== RCS file: /repository/Zend/zend_execute.c,v retrieving revision 1.316.2.8 diff -u -p -r1.316.2.8 zend_execute.c --- zend_execute.c 17 May 2003 07:49:29 -0000 1.316.2.8 +++ zend_execute.c 20 May 2003 00:27:05 -0000 @@ -2123,9 +2123,9 @@ send_by_ref: } } else { if (EX(opline)->op2.u.constant.value.lval==ZEND_INCLUDE_ONCE) { - zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file_handle.filename); + zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, inc_filename->value..str.val); } else { - zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, file_handle.filename); + zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, inc_filename->value..str.val); } } break;