From: Dmitry Stogov <dmitry@php.net>
Date: Wed, 6 Sep 2006 08:54:44 +0000 (+0000)
Subject: Fixed php_admin* bypass by ini_restore()
X-Git-Tag: php-5.2.0RC4~90
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0c3c55edac9a0d27ca0fc829ab34bf9116ef7fca;p=php

Fixed php_admin* bypass by ini_restore()
---

diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
index 92bb40e12e..1cade26d6a 100644
--- a/Zend/zend_ini.c
+++ b/Zend/zend_ini.c
@@ -274,7 +274,8 @@ ZEND_API int zend_restore_ini_entry(char *name, uint name_length, int stage)
 	zend_ini_entry *ini_entry;
 	TSRMLS_FETCH();
 
-	if (zend_hash_find(EG(ini_directives), name, name_length, (void **) &ini_entry)==FAILURE) {
+	if (zend_hash_find(EG(ini_directives), name, name_length, (void **) &ini_entry)==FAILURE ||
+	    (stage == ZEND_INI_STAGE_RUNTIME && (ini_entry->modifiable & ZEND_INI_USER) == 0)) {
 		return FAILURE;
 	}