summaryrefslogtreecommitdiff
path: root/main/php_ini.c
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2001-08-03 07:15:14 +0000
committerZeev Suraski <zeev@php.net>2001-08-03 07:15:14 +0000
commit2ec440078a74d86a0ddcd0818bc37d21bfe98082 (patch)
tree031fed6ccad35814abc94ad3df7182ebb7d74bd6 /main/php_ini.c
parent11908f2db85a7de4b1fcb27b942fe4e558b0b815 (diff)
downloadphp-git-2ec440078a74d86a0ddcd0818bc37d21bfe98082.tar.gz
Get rid of a couple of bogus persist_alloc()'s, and some cleanup
Diffstat (limited to 'main/php_ini.c')
-rw-r--r--main/php_ini.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/main/php_ini.c b/main/php_ini.c
index 460b7373ea..2d14300b3c 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -273,7 +273,8 @@ int php_init_config(char *php_ini_path_override)
tmp.value.str.val = zend_strndup(php_ini_opened_path, tmp.value.str.len);
tmp.type = IS_STRING;
zend_hash_update(&configuration_hash, "cfg_file_path", sizeof("cfg_file_path"),(void *) &tmp,sizeof(zval), NULL);
- persist_alloc(php_ini_opened_path);
+ efree(php_ini_opened_path);
+ php_ini_opened_path = zend_strndup(tmp.value.str.val, tmp.value.str.len);
}
return SUCCESS;
@@ -286,7 +287,7 @@ int php_shutdown_config(void)
{
zend_hash_destroy(&configuration_hash);
if (php_ini_opened_path) {
- efree(php_ini_opened_path);
+ free(php_ini_opened_path);
}
return SUCCESS;
}