diff options
| author | Xinchen Hui <laruence@php.net> | 2015-02-15 22:55:42 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-02-15 22:55:42 +0800 |
| commit | edd16831b13fcd4b1552328d55ed99647ab23c3a (patch) | |
| tree | fa2d59ce89f9db7712fabb8054f844b94ade34a3 | |
| parent | 4137956d0e72690da76c0e1bbca9ba038cade1ae (diff) | |
| parent | a620b7904023202b8b4a5d7792368bd752c432e9 (diff) | |
| download | php-git-edd16831b13fcd4b1552328d55ed99647ab23c3a.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
| -rw-r--r-- | ext/readline/readline.c | 5 | ||||
| -rw-r--r-- | ext/readline/tests/bug69054.phpt | 11 |
2 files changed, 14 insertions, 2 deletions
diff --git a/ext/readline/readline.c b/ext/readline/readline.c index f48194a439..8cf7734b62 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -400,12 +400,13 @@ PHP_FUNCTION(readline_read_history) return; } - if (php_check_open_basedir(arg TSRMLS_CC)) { + if (arg && php_check_open_basedir(arg TSRMLS_CC)) { RETURN_FALSE; } /* XXX from & to NYI */ if (read_history(arg)) { + /* If filename is NULL, then read from `~/.history' */ RETURN_FALSE; } else { RETURN_TRUE; @@ -424,7 +425,7 @@ PHP_FUNCTION(readline_write_history) return; } - if (php_check_open_basedir(arg TSRMLS_CC)) { + if (arg && php_check_open_basedir(arg TSRMLS_CC)) { RETURN_FALSE; } diff --git a/ext/readline/tests/bug69054.phpt b/ext/readline/tests/bug69054.phpt new file mode 100644 index 0000000000..f17f803ea4 --- /dev/null +++ b/ext/readline/tests/bug69054.phpt @@ -0,0 +1,11 @@ +--TEST-- +Bug #69054 (Null dereference in readline_(read|write)_history() without parameters) +--SKIPIF-- +<?php if (!extension_loaded("readline") || !function_exists('readline_add_history')) die("skip"); ?> +--INI-- +open_basedir=/tmp +--FILE-- +<?php readline_read_history(); ?> +==DONE== +--EXPECT-- +==DONE== |