diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-26 10:25:55 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-26 10:25:55 +0200 |
| commit | 247d5618aadfb32eba8fac8ee271fcbc9d1cc885 (patch) | |
| tree | 62b73e2128b3488492a707f8ed28c24142301974 | |
| parent | 23db95e3e5cf0a8e147a7b2b377bde3f13fc8a29 (diff) | |
| parent | 99c67804d5a68ea374085e3f0ce21b85047c58eb (diff) | |
| download | php-git-247d5618aadfb32eba8fac8ee271fcbc9d1cc885.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
| -rw-r--r-- | Zend/tests/assert/expect_015.phpt | 4 | ||||
| -rw-r--r-- | Zend/zend_ast.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Zend/tests/assert/expect_015.phpt b/Zend/tests/assert/expect_015.phpt index 1679640851..72f13ff83f 100644 --- a/Zend/tests/assert/expect_015.phpt +++ b/Zend/tests/assert/expect_015.phpt @@ -140,6 +140,7 @@ assert(0 && ($a = function () { if ($a) { } elseif ($b) { } + if ($a); else; })); ?> @@ -292,4 +293,7 @@ Warning: assert(): assert(0 && ($a = function () { if ($a) { } elseif ($b) { } + if ($a) { + } else { + } })) failed in %sexpect_015.php on line %d diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index 685189ed7d..abbb3f952b 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -1224,7 +1224,7 @@ tail_call: } else { zend_ast_export_indent(str, indent); smart_str_appends(str, "} else "); - if (ast->child[1]->kind == ZEND_AST_IF) { + if (ast->child[1] && ast->child[1]->kind == ZEND_AST_IF) { list = (zend_ast_list*)ast->child[1]; goto tail_call; } else { |