mirror of
https://github.com/php/php-src.git
synced 2024-11-28 12:26:37 +08:00
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: Add open_basedir checks to readline_write_history and readline_read_history
This commit is contained in:
commit
2208fb3256
@ -384,6 +384,10 @@ PHP_FUNCTION(readline_read_history)
|
||||
return;
|
||||
}
|
||||
|
||||
if (php_check_open_basedir(arg TSRMLS_CC)) {
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
/* XXX from & to NYI */
|
||||
if (read_history(arg)) {
|
||||
RETURN_FALSE;
|
||||
@ -404,6 +408,10 @@ PHP_FUNCTION(readline_write_history)
|
||||
return;
|
||||
}
|
||||
|
||||
if (php_check_open_basedir(arg TSRMLS_CC)) {
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
if (write_history(arg)) {
|
||||
RETURN_FALSE;
|
||||
} else {
|
||||
|
Loading…
Reference in New Issue
Block a user