summaryrefslogtreecommitdiff
path: root/ext/standard/basic_functions.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2014-02-18 16:44:01 +0400
committerDmitry Stogov <dmitry@zend.com>2014-02-18 16:44:01 +0400
commit7428cac6e8d1d7aca3e156def8f13e184ebd0c35 (patch)
tree9a15ce8ec334288f6510d102009812d661436fa5 /ext/standard/basic_functions.c
parent9ddf3c57805f0bb76a26cb31ba33e64c04d2133c (diff)
downloadphp-git-7428cac6e8d1d7aca3e156def8f13e184ebd0c35.tar.gz
Use better data structures (incomplete)
Diffstat (limited to 'ext/standard/basic_functions.c')
-rw-r--r--ext/standard/basic_functions.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 76504eb4d0..c50e9b9380 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -5334,7 +5334,7 @@ PHP_FUNCTION(ini_get)
return;
}
- str = zend_ini_string(varname, varname_len + 1, 0);
+ str = zend_ini_string(varname, varname_len, 0);
if (!str) {
RETURN_FALSE;
@@ -5510,11 +5510,11 @@ PHP_FUNCTION(set_include_path)
key = STR_INIT("include_path", sizeof("include_path")-1, 0);
if (zend_alter_ini_entry_ex(key, new_value, new_value_len, PHP_INI_USER, PHP_INI_STAGE_RUNTIME, 0 TSRMLS_CC) == FAILURE) {
- STR_FREE(key);
+ STR_RELEASE(key);
zval_dtor(return_value);
RETURN_FALSE;
}
- STR_FREE(key);
+ STR_RELEASE(key);
}
/* }}} */
@@ -5612,7 +5612,7 @@ PHP_FUNCTION(ignore_user_abort)
if (arg) {
zend_string *key = STR_INIT("ignore_user_abort", sizeof("ignore_user_abort"), 0);
zend_alter_ini_entry_ex(key, arg, arg_len, PHP_INI_USER, PHP_INI_STAGE_RUNTIME, 0 TSRMLS_CC);
- STR_FREE(key);
+ STR_RELEASE(key);
}
RETURN_LONG(old_setting);