From 73596c56e7905ce5b7c4f15d551361ee744cad0c Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 2 Jan 2019 11:32:48 +0100 Subject: [PATCH] Partial fix for bug #75426 This does not print the exact line of the comma, but rather the line of the previous element. This should generally be "good enough", as the line number is close (off by one) to the actual issue now. Previously it would point to the start of the array, which may be very far away. --- Zend/tests/bug75426.phpt | 15 +++++++++++++++ Zend/zend_compile.c | 7 +++++++ 2 files changed, 22 insertions(+) create mode 100644 Zend/tests/bug75426.phpt diff --git a/Zend/tests/bug75426.phpt b/Zend/tests/bug75426.phpt new file mode 100644 index 0000000000..69e3f19239 --- /dev/null +++ b/Zend/tests/bug75426.phpt @@ -0,0 +1,15 @@ +--TEST-- +Bug #75426: "Cannot use empty array elements" reports wrong position +--FILE-- + +--EXPECTF-- +Fatal error: Cannot use empty array elements in arrays in %s on line 5 diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 77702b3fac..23c3b99968 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -6920,6 +6920,7 @@ static inline void zend_ct_eval_greater(zval *result, zend_ast_kind kind, zval * static zend_bool zend_try_ct_eval_array(zval *result, zend_ast *ast) /* {{{ */ { zend_ast_list *list = zend_ast_get_list(ast); + zend_ast *last_elem_ast = NULL; uint32_t i; zend_bool is_constant = 1; @@ -6932,6 +6933,10 @@ static zend_bool zend_try_ct_eval_array(zval *result, zend_ast *ast) /* {{{ */ zend_ast *elem_ast = list->child[i]; if (elem_ast == NULL) { + /* Report error at line of last non-empty element */ + if (last_elem_ast) { + CG(zend_lineno) = zend_ast_get_lineno(last_elem_ast); + } zend_error(E_COMPILE_ERROR, "Cannot use empty array elements in arrays"); } @@ -6943,6 +6948,8 @@ static zend_bool zend_try_ct_eval_array(zval *result, zend_ast *ast) /* {{{ */ ) { is_constant = 0; } + + last_elem_ast = elem_ast; } if (!is_constant) { -- 2.40.0