Fixed bug #38993 (Fixed safe_mode/open_basedir checks for

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

View file

@ -154,11 +154,19 @@ static PHP_INI_MH(OnUpdateSaveDir)
{
/* Only do the safemode/open_basedir check at 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;
}
if (php_check_open_basedir(new_value TSRMLS_CC)) {
if (php_check_open_basedir(p TSRMLS_CC)) {
return FAILURE;
}
}

View file

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