Merge branch 'PHP-7.4'

nikic · nikic · commit d882795d78b1 · 2019-10-02T12:08:12.000+02:00
diff --git a/Zend/tests/halt_compiler5.phpt b/Zend/tests/halt_compiler5.phpt
@@ -0,0 +1,11 @@
+--TEST--
+Using __COMPILER_HALF_OFFSET__ with trailing {} (OSS-Fuzz #17895)
+--FILE--
+<?php
+__COMPILER_HALT_OFFSET__;
+{}
+--EXPECTF--
+Fatal error: Uncaught Error: Undefined constant '__COMPILER_HALT_OFFSET__' in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -7825,6 +7825,9 @@ void zend_compile_const(znode *result, zend_ast *ast) /* {{{ */
 
 		while (last && last->kind == ZEND_AST_STMT_LIST) {
 			zend_ast_list *list = zend_ast_get_list(last);
+			if (list->children == 0) {
+				break;
+			}
 			last = list->child[list->children-1];
 		}
 		if (last && last->kind == ZEND_AST_HALT_COMPILER) {

Original file line number	Diff line number	Diff line change
`@@ -7825,6 +7825,9 @@ void zend_compile_const(znode result, zend_ast ast) /* {{{ */`
`7825`	`7825`
`7826`	`7826`	`while (last && last->kind == ZEND_AST_STMT_LIST) {`
`7827`	`7827`	`zend_ast_list *list = zend_ast_get_list(last);`
	`7828`	`+ if (list->children == 0) {`
	`7829`	`+ break;`
	`7830`	`+ }`
`7828`	`7831`	`last = list->child[list->children-1];`
`7829`	`7832`	`}`
`7830`	`7833`	`if (last && last->kind == ZEND_AST_HALT_COMPILER) {`