diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-07-03 23:56:27 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-07-03 23:56:27 +0800 |
| commit | 612aff3a8a42bb5ef756e60769b16f9879c7f036 (patch) | |
| tree | 86bd1d62c3a365c940c9e2e2c643f8ec73657b75 | |
| parent | 6744737577bcbae4ff3d0082f23c9282758cacbb (diff) | |
| download | php-git-612aff3a8a42bb5ef756e60769b16f9879c7f036.tar.gz | |
Fixed bug #72538 (readline_redisplay crashes php)
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/readline/readline.c | 5 | ||||
| -rw-r--r-- | ext/readline/tests/bug72538.phpt | 15 |
3 files changed, 23 insertions, 0 deletions
@@ -27,6 +27,9 @@ PHP NEWS . Fixed bug #72476 (Memleak in jit_stack). (Laruence) . Fixed bug #72463 (mail fails with invalid argument). (Anatol) +- Readline: + . Fixed bug #72538 (readline_redisplay crashes php). (Laruence) + - Standard: . Fixed bug #72505 (readfile() mangles files larger than 2G). (Cschneid) . Fixed bug #72306 (Heap overflow through proc_open and $env parameter). diff --git a/ext/readline/readline.c b/ext/readline/readline.c index ad9b01a946..362dc2f876 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -616,6 +616,11 @@ PHP_FUNCTION(readline_callback_handler_remove) Ask readline to redraw the display */ PHP_FUNCTION(readline_redisplay) { +#if HAVE_LIBEDIT + /* seems libedit doesn't take care of rl_initialize in rl_redisplay + * see bug #72538 */ + using_history(); +#endif rl_redisplay(); } /* }}} */ diff --git a/ext/readline/tests/bug72538.phpt b/ext/readline/tests/bug72538.phpt new file mode 100644 index 0000000000..98b9b2651e --- /dev/null +++ b/ext/readline/tests/bug72538.phpt @@ -0,0 +1,15 @@ +--TEST-- +Bug #72538 (readline_redisplay crashes php) +--SKIPIF-- +<?php if (!extension_loaded("readline")) die("skip"); +if (READLINE_LIB != "libedit") die("skip libedit only"); +?> +--FILE-- +<?php + +readline_redisplay(); + +?> +okey +--EXPECT-- +okey |