summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2021-01-07 13:48:17 +0100
committerChristoph M. Becker <cmbecker69@gmx.de>2021-01-07 13:48:17 +0100
commit8ae02c8a9588b36e93da3ba88d32956323fc30d4 (patch)
tree15f3d3e0e488a504be51c94b5834f02b69555023
parent34ef804b04a8d4481490a248e867fca696b5c590 (diff)
parent9450893dc682fa09ea1265acd2d885710ca82699 (diff)
downloadphp-git-8ae02c8a9588b36e93da3ba88d32956323fc30d4.tar.gz
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4: Avoid modifying the return value of readline_completion_function()
-rw-r--r--ext/readline/readline.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index ec1d1ff255..647eb0977f 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -448,6 +448,7 @@ char **php_readline_completion_cb(const char *text, int start, int end)
if (call_user_function(NULL, NULL, &_readline_completion, &_readline_array, 3, params) == SUCCESS) {
if (Z_TYPE(_readline_array) == IS_ARRAY) {
+ SEPARATE_ARRAY(&_readline_array);
if (zend_hash_num_elements(Z_ARRVAL(_readline_array))) {
matches = rl_completion_matches(text,_readline_command_generator);
} else {