Apply the same parse error handling to (include|require)_once as the one for

their non-once counterparts.

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index c41bb7b87c0fb375b72b1c55d4980b1fb03ffbdd..3296e67647878dcd8e90d480f60b17ec1b2a83d2 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -3369,6 +3369,9 @@ int zend_include_or_eval_handler(ZEND_OPCODE_HANDLER_ARGS)
                                        if (zend_hash_add(&EG(included_files), file_handle.opened_path, strlen(file_handle.opened_path)+1, (void *)&dummy, sizeof(int), NULL)==SUCCESS) {
                                                new_op_array = zend_compile_file(&file_handle, (EX(opline)->op2.u.constant.value.lval==ZEND_INCLUDE_ONCE?ZEND_INCLUDE:ZEND_REQUIRE) TSRMLS_CC);
                                                zend_destroy_file_handle(&file_handle TSRMLS_CC);
+                                               if (!new_op_array) {
+                                                       zend_error(E_ERROR, "Parse error inside included file.");
+                                               }
                                        } else {
                                                zend_file_handle_dtor(&file_handle);
                                                failure_retval=1;