From: Pierre Joye <pajoye@php.net>
Date: Thu, 28 Jul 2011 10:42:45 +0000 (+0000)
Subject: - Fix #55301 (readline part) check if malloc succeded
X-Git-Tag: php-5.4.0alpha3~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=618b480d910a837c61ab554e77af45f66a8a770a;p=php

- Fix #55301 (readline part) check if malloc succeded
---

diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index a5d0f7d2ba..e9cdacb275 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -478,6 +478,9 @@ static char **_readline_completion_cb(const char *text, int start, int end)
 				matches = rl_completion_matches(text,_readline_command_generator);
 			} else {
 				matches = malloc(sizeof(char *) * 2);
+				if (!matches) {
+					return NULL;
+				}
 				matches[0] = strdup("");
 				matches[1] = '\0';
 			}
@@ -518,7 +521,10 @@ PHP_FUNCTION(readline_completion_function)
 	zval_copy_ctor(_readline_completion);
 
 	rl_attempted_completion_function = _readline_completion_cb;
-
+	if (rl_attempted_completion_function == NULL) {
+		efree(name);
+		RETURN_FALSE;
+	}
 	RETURN_TRUE;
 }