summaryrefslogtreecommitdiff
path: root/main/php_ini.c
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2014-05-08 15:20:13 +0800
committerXinchen Hui <laruence@php.net>2014-05-08 15:20:13 +0800
commitc242518bf0d2c3132c60c8f8dfba64329f73e90e (patch)
tree8155972d987353d935606b3166bda5de2b7844c8 /main/php_ini.c
parent5f46c8fa31a8cfa0ad03b9aebd04243a09ac7be1 (diff)
downloadphp-git-c242518bf0d2c3132c60c8f8dfba64329f73e90e.tar.gz
There should been memory leaks(and don't use pointer cast)
Diffstat (limited to 'main/php_ini.c')
-rw-r--r--main/php_ini.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/php_ini.c b/main/php_ini.c
index d742712758..cdd4a61fb5 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -262,7 +262,7 @@ static void php_ini_parser_cb(zval *arg1, zval *arg2, zval *arg3, int callback_t
/* If option not found in hash or is not an array -> create array, otherwise add to existing array */
if ((find_arr = zend_hash_find(active_hash, Z_STR_P(arg1))) == NULL || Z_TYPE_P(find_arr) != IS_ARRAY) {
ZVAL_NEW_PERSISTENT_ARR(&option_arr);
- zend_hash_init(Z_ARRVAL(option_arr), 8, NULL, (dtor_func_t) config_zval_dtor, 1);
+ zend_hash_init(Z_ARRVAL(option_arr), 8, NULL, config_zval_dtor, 1);
find_arr = zend_hash_update(active_hash, Z_STR_P(arg1), &option_arr);
}
@@ -386,7 +386,7 @@ int php_init_config(TSRMLS_D)
int free_ini_search_path = 0;
zend_file_handle fh;
- zend_hash_init(&configuration_hash, 8, NULL, (dtor_func_t) config_zval_dtor, 1);
+ zend_hash_init(&configuration_hash, 8, NULL, config_zval_dtor, 1);
if (sapi_module.ini_defaults) {
sapi_module.ini_defaults(&configuration_hash);