cvs: php4 /ext/readline readline.c
| From: | Stanislav Malyshev | Date: | Thu, 24 Aug 2000 14:41:13 +0000 |
| Subject: | cvs: php4 /ext/readline readline.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-1366@lists.php.net to get a copy of this message | ||
stas Thu Aug 24 07:41:13 2000 EDT
Modified files:
/php4/ext/readline readline.c
Log:
Fix segfault on readline without parameters
Index: php4/ext/readline/readline.c
diff -u php4/ext/readline/readline.c:1.13 php4/ext/readline/readline.c:1.14
--- php4/ext/readline/readline.c:1.13 Mon Jun 5 12:47:44 2000
+++ php4/ext/readline/readline.c Thu Aug 24 07:41:12 2000
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: readline.c,v 1.13 2000/06/05 19:47:44 andi Exp $ */
+/* $Id: readline.c,v 1.14 2000/08/24 14:41:12 stas Exp $ */
/* {{{ includes & prototypes */
@@ -99,9 +99,11 @@
if (ac < 0 || ac > 1 || zend_get_parameters_ex(ac, &arg) == FAILURE) {
WRONG_PARAM_COUNT;
}
- convert_to_string_ex(arg);
+ if(ac == 1) {
+ convert_to_string_ex(arg);
+ }
- result = readline((*arg)->value.str.val);
+ result = readline(ac?(*arg)->value.str.val:NULL);
if (! result) {
RETURN_FALSE;