summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJani Taskinen <jani@php.net>2007-09-27 16:28:39 +0000
committerJani Taskinen <jani@php.net>2007-09-27 16:28:39 +0000
commit395c0680434e96524fa56732cd6e9da7fd75e6f5 (patch)
treed9be5c9736478b2e3320d17e2ba2521b21191803
parentb117c94942b48805042cea327ecb47ac06fc5fae (diff)
downloadphp-git-395c0680434e96524fa56732cd6e9da7fd75e6f5.tar.gz
MFB: Missing part of some fix (by Ilia)
-rw-r--r--Zend/zend_ini.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
index 82f63fab7e..68edf977a3 100644
--- a/Zend/zend_ini.c
+++ b/Zend/zend_ini.c
@@ -55,7 +55,9 @@ static int zend_restore_ini_entry_cb(zend_ini_entry *ini_entry, int stage TSRMLS
ini_entry->on_modify(ini_entry, ini_entry->orig_value, ini_entry->orig_value_length, ini_entry->mh_arg1, ini_entry->mh_arg2, ini_entry->mh_arg3, stage TSRMLS_CC);
} zend_end_try();
}
- efree(ini_entry->value);
+ if (ini_entry->value != ini_entry->orig_value) {
+ efree(ini_entry->value);
+ }
ini_entry->value = ini_entry->orig_value;
ini_entry->value_length = ini_entry->orig_value_length;
ini_entry->modified = 0;