From 779edcb01d804db15d69a6c2e46abb7e1c768370 Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Fri, 4 Feb 2005 00:21:50 +0000 Subject: [PATCH] Proper fix for bug #31796 . --- ext/readline/readline.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ext/readline/readline.c b/ext/readline/readline.c index a11646b29a..28d7ed709c 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -377,7 +377,7 @@ static char *_readline_command_generator(char *text,int state) } } - return strdup(""); + return NULL; } static zval *_readline_string_zval(const char *str) @@ -420,7 +420,13 @@ static char **_readline_completion_cb(const char *text, int start, int end) if (call_user_function(CG(function_table), NULL, _readline_completion, &_readline_array, 3, params TSRMLS_CC) == SUCCESS) { if (Z_TYPE(_readline_array) == IS_ARRAY) { - matches = completion_matches(text,_readline_command_generator); + if (zend_hash_num_elements(Z_ARRVAL(_readline_array))) { + matches = completion_matches(text,_readline_command_generator); + } else { + matches = malloc(sizeof(char *) * 2); + matches[0] = strdup(""); + matches[1] = '\0'; + } } } -- 2.50.1