Handle empty (NULL) stmt in ast_export

diff --git a/Zend/tests/assert/expect_empty_stmt_bug.phpt b/Zend/tests/assert/expect_empty_stmt_bug.phpt
new file mode 100644 (file)
index 0000000..f5dcff3
--- /dev/null
+++ b/Zend/tests/assert/expect_empty_stmt_bug.phpt
@@ -0,0 +1,11 @@
+--TEST--
+Empty statement in assert() shouldn't segfault
+--FILE--
+<?php
+
+assert((function () { return true;; })());
+echo "ok";
+
+?>
+--EXPECT--
+ok

diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c
index 714a1443b087c96e93c92193fee894151ffa450d..d36ce0b2ad5bdc91eacf4e0718fd4cebb94950a1 100644 (file)
--- a/Zend/zend_ast.c
+++ b/Zend/zend_ast.c
@@ -783,6 +783,10 @@ static void zend_ast_export_var_list(smart_str *str, zend_ast_list *list, int in
 
 static void zend_ast_export_stmt(smart_str *str, zend_ast *ast, int indent)
 {
+       if (!ast) {
+               return;
+       }
+
        if (ast->kind == ZEND_AST_STMT_LIST ||
            ast->kind == ZEND_AST_TRAIT_ADAPTATIONS) {
                zend_ast_list *list = (zend_ast_list*)ast;