From: Ilia Alshanetsky <iliaa@php.net>
Date: Fri, 4 Feb 2005 00:22:03 +0000 (+0000)
Subject: MFH: Proper fix for bug #31796 .
X-Git-Tag: php-4.3.11RC1~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0eef1a17045f0ca2cf045e1ee35a98ede9541c2;p=php

MFH: Proper fix for bug #31796 .
---

diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 3da4af0e9c..ec07121ff3 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -354,7 +354,7 @@ static char *_readline_command_generator(char *text,int state)
 		}
 	}
 
-	return strdup("");
+	return NULL;
 }
 
 static zval *_readline_string_zval(const char *str)
@@ -393,7 +393,13 @@ static char **_readline_completion_cb(char *text, int start, int end)
 
 	if (call_user_function(CG(function_table), NULL, params[0], &_readline_array, 3, params+1 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';
+			}
 		}
 	}