diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-12-25 20:32:46 -0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-12-25 20:32:46 -0800 |
| commit | 7a5c663ec645d0f8969e5ebbe76feb5cdd574fe3 (patch) | |
| tree | 89cf7fa89d020269390cd9a58cd0d1bbdc9d19e9 | |
| parent | b3d0178915163c8d52091a6a822007a56ce02801 (diff) | |
| parent | 6700be67f58611d08bbacc44f327ce98ed0473c9 (diff) | |
| download | php-git-7a5c663ec645d0f8969e5ebbe76feb5cdd574fe3.tar.gz | |
Merge branch 'PHP-7.0'
| -rw-r--r-- | Zend/tests/bug71221.phpt | 10 | ||||
| -rw-r--r-- | Zend/zend_builtin_functions.c | 4 |
2 files changed, 14 insertions, 0 deletions
diff --git a/Zend/tests/bug71221.phpt b/Zend/tests/bug71221.phpt new file mode 100644 index 0000000000..e735302d9e --- /dev/null +++ b/Zend/tests/bug71221.phpt @@ -0,0 +1,10 @@ +--TEST-- +Bug #71221 (Null pointer deref (segfault) in get_defined_vars via ob_start) +--FILE-- +<?php +ob_start("get_defined_vars"); +ob_end_clean(); +?> +okey +--EXPECT-- +okey diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index e5a9518f54..0325ca7b4a 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1947,6 +1947,10 @@ ZEND_FUNCTION(get_defined_vars) { zend_array *symbol_table = zend_rebuild_symbol_table(); + if (UNEXPECTED(symbol_table == NULL)) { + return; + } + RETURN_ARR(zend_array_dup(symbol_table)); } /* }}} */ |