archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed bug #38993 (Fixed safe_mode/open_basedir checks for

Browse source 
session.save_path, allowing them to account for extra parameters).
This commit is contained in:
Ilia Alshanetsky 2006-10-01 20:58:02 +00:00
parent bd088df90c
commit 154f70acf1
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -6,6 +6,8 @@ PHP NEWS
- Fixed mess with CGI/CLI -d option (now it works with cgi; constants are - Fixed mess with CGI/CLI -d option (now it works with cgi; constants are
working exactly like in php.ini; with FastCGI -d affects all requests). working exactly like in php.ini; with FastCGI -d affects all requests).
(Dmitry) (Dmitry)
- Fixed bug #38993 (Fixed safe_mode/open_basedir checks for
session.save_path, allowing them to account for extra parameters). (Ilia)
- Fixed bug #38981 (using FTP URLs in get_headers() causes crash). (Tony) - Fixed bug #38981 (using FTP URLs in get_headers() causes crash). (Tony)
- Fixed bug #38961 (metaphone() results in segmentation fault on NetBSD). - Fixed bug #38961 (metaphone() results in segmentation fault on NetBSD).
(Tony) (Tony)

12
ext/session/session.c
View file

@ -154,11 +154,19 @@ static PHP_INI_MH(OnUpdateSaveDir)
{ {
/* Only do the safemode/open_basedir check at runtime */ /* Only do the safemode/open_basedir check at runtime */
if (stage == PHP_INI_STAGE_RUNTIME) { if (stage == PHP_INI_STAGE_RUNTIME) {
if (PG(safe_mode) && (!php_checkuid(new_value, NULL, CHECKUID_ALLOW_ONLY_DIR))) { char *p;
if ((p = zend_memrchr(new_value, ';', new_value_length))) {
p++;
} else {
p = new_value;
}
if (PG(safe_mode) && (!php_checkuid(p, NULL, CHECKUID_ALLOW_ONLY_DIR))) {
return FAILURE; return FAILURE;
} }
if (php_check_open_basedir(new_value TSRMLS_CC)) { if (php_check_open_basedir(p TSRMLS_CC)) {
return FAILURE; return FAILURE;
} }
} }

1
ext/standard/basic_functions.c
View file

@ -5622,7 +5622,6 @@ PHP_FUNCTION(ini_set)
_CHECK_PATH(varname, "java.class.path") || _CHECK_PATH(varname, "java.class.path") ||
_CHECK_PATH(varname, "java.home") || _CHECK_PATH(varname, "java.home") ||
_CHECK_PATH(varname, "java.library.path") || _CHECK_PATH(varname, "java.library.path") ||
_CHECK_PATH(varname, "session.save_path") ||
_CHECK_PATH(varname, "vpopmail.directory")) { _CHECK_PATH(varname, "vpopmail.directory")) {
if (PG(safe_mode) &&(!php_checkuid(Z_STRVAL_PP(new_value), NULL, CHECKUID_CHECK_FILE_AND_DIR))) { if (PG(safe_mode) &&(!php_checkuid(Z_STRVAL_PP(new_value), NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
zval_dtor(return_value); zval_dtor(return_value);