Fixed bug #69054 (Null dereference in readline_(read|write)_history() without parameters)

Author: laruence

NEWS

@@ -18,6 +18,10 @@ PHP                                                                        NEWS
   . Fixed bug #68638 (pg_update() fails to store infinite values).
     (william dot welter at 4linux dot com dot br, Laruence)
 
+- Readline:
+  . Fixed bug #69054 (Null dereference in readline_(read|write)_history() without
+    parameters). (Laruence)
+
 - CGI:
   . Fixed bug #69015 (php-cgi's getopt does not see $argv). (Laruence)
 

ext/readline/readline.c

@@ -400,12 +400,13 @@ PHP_FUNCTION(readline_read_history)
 		return;
 	}
 
-	if (php_check_open_basedir(arg TSRMLS_CC)) {
+	if (arg && php_check_open_basedir(arg TSRMLS_CC)) {
 		RETURN_FALSE;
 	}
 
 	/* XXX from & to NYI */
 	if (read_history(arg)) {
+		/* If filename is NULL, then read from `~/.history' */
 		RETURN_FALSE;
 	} else {
 		RETURN_TRUE;
@@ -424,7 +425,7 @@ PHP_FUNCTION(readline_write_history)
 		return;
 	}
 
-	if (php_check_open_basedir(arg TSRMLS_CC)) {
+	if (arg && php_check_open_basedir(arg TSRMLS_CC)) {
 		RETURN_FALSE;
 	}
 

ext/readline/tests/bug69054.phpt

@@ -0,0 +1,11 @@
+--TEST--
+Bug #69054 (Null dereference in readline_(read|write)_history() without parameters)
+--SKIPIF--
+<?php if (!extension_loaded("readline") || !function_exists('readline_add_history')) die("skip"); ?>
+--INI--
+open_basedir=/tmp
+--FILE--
+<?php readline_read_history(); ?>
+==DONE==
+--EXPECT--
+==DONE==