diff options
| author | Sara Golemon <pollita@php.net> | 2016-05-12 02:51:14 +0000 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2016-05-12 02:51:14 +0000 |
| commit | 8523b1f8ed9de76a9195fcd85055afbed86a0bd7 (patch) | |
| tree | 8cef2f6add36e14facd8c3c0889ac4e35bdf8c3d | |
| parent | 8a7a913a7a8c6ba4303751e498ee3aaded037186 (diff) | |
| parent | a73b03edea9b988e079b3c8c2018321e834ff78f (diff) | |
| download | php-git-8523b1f8ed9de76a9195fcd85055afbed86a0bd7.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
Fix serializing ZEND_AST_SHELL_EXEC
| -rw-r--r-- | Zend/tests/ast_serialize_backtick_literal.phpt | 11 | ||||
| -rw-r--r-- | Zend/zend_ast.c | 6 |
2 files changed, 16 insertions, 1 deletions
diff --git a/Zend/tests/ast_serialize_backtick_literal.phpt b/Zend/tests/ast_serialize_backtick_literal.phpt new file mode 100644 index 0000000000..03bdc298ac --- /dev/null +++ b/Zend/tests/ast_serialize_backtick_literal.phpt @@ -0,0 +1,11 @@ +--TEST-- +Serialization of backtick literal is incorrect +--INI-- +zend.assertions=1 +--FILE-- +<?php + +assert_options(ASSERT_WARNING); +assert(false && `echo -n ""`); +--EXPECTF-- +Warning: assert(): assert(false && `echo -n ""`) failed in %s/ast_serialize_backtick_literal.php on line 4 diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c index 2636d2d561..b738ac7ff3 100644 --- a/Zend/zend_ast.c +++ b/Zend/zend_ast.c @@ -1220,7 +1220,11 @@ simple_list: if (ast->child[0]->kind == ZEND_AST_ENCAPS_LIST) { zend_ast_export_encaps_list(str, '`', (zend_ast_list*)ast->child[0], indent); } else { - zend_ast_export_ex(str, ast->child[0], 0, indent); + zval *zv; + ZEND_ASSERT(ast->child[0]->kind == ZEND_AST_ZVAL); + zv = zend_ast_get_zval(ast->child[0]); + ZEND_ASSERT(Z_TYPE_P(zv) == IS_STRING); + zend_ast_export_qstr(str, '`', Z_STR_P(zv)); } smart_str_appendc(str, '`'); break; |