archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Avoid string copy in get_cfg_var()

Browse source 
basic_functions.c already has a macro for returning an ini
value to userland, so make use of it for get_cfg_var() as well,
after generalizing it to not write to return_value in particular.
This commit is contained in:
Nikita Popov 2021-08-27 15:34:46 +02:00
parent 43cb2548f7
commit 51a504c8be
2 changed files with 25 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Zend/Optimizer/zend_func_info.c
View file

@ -132,7 +132,7 @@ static const func_info_t old_func_infos[] = {
F1("quoted_printable_decode", MAY_BE_STRING),
F1("quoted_printable_encode", MAY_BE_STRING),
F1("get_current_user", MAY_BE_STRING),
F1("get_cfg_var", MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY),
FN("get_cfg_var", MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY),
F1("error_get_last", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING),
F1("serialize", MAY_BE_STRING),
F1("var_export", MAY_BE_NULL | MAY_BE_STRING),

60
ext/standard/basic_functions.c
View file

@ -1340,25 +1340,32 @@ PHP_FUNCTION(get_current_user)
}
/* }}} */
#define ZVAL_SET_INI_STR(zv, val) do { \
if (ZSTR_IS_INTERNED(val)) { \
ZVAL_INTERNED_STR(zv, val); \
} else if (ZSTR_LEN(val) == 0) { \
ZVAL_EMPTY_STRING(zv); \
} else if (ZSTR_LEN(val) == 1) { \
ZVAL_CHAR(zv, ZSTR_VAL(val)[0]); \
} else if (!(GC_FLAGS(val) & GC_PERSISTENT)) { \
ZVAL_NEW_STR(zv, zend_string_copy(val)); \
} else { \
ZVAL_NEW_STR(zv, zend_string_init(ZSTR_VAL(val), ZSTR_LEN(val), 0)); \
} \
} while (0)
static void add_config_entries(HashTable *hash, zval *return_value);
/* {{{ add_config_entry */
static void add_config_entry(zend_ulong h, zend_string *key, zval *entry, zval *retval)
{
if (Z_TYPE_P(entry) == IS_STRING) {
zend_string *str = Z_STR_P(entry);
if (!ZSTR_IS_INTERNED(str)) {
if (!(GC_FLAGS(str) & GC_PERSISTENT)) {
zend_string_addref(str);
} else {
str = zend_string_init(ZSTR_VAL(str), ZSTR_LEN(str), 0);
}
}
zval str_zv;
ZVAL_SET_INI_STR(&str_zv, Z_STR_P(entry));
if (key) {
add_assoc_str_ex(retval, ZSTR_VAL(key), ZSTR_LEN(key), str);
add_assoc_zval_ex(retval, ZSTR_VAL(key), ZSTR_LEN(key), &str_zv);
} else {
add_index_str(retval, h, str);
add_index_zval(retval, h, &str_zv);
}
} else if (Z_TYPE_P(entry) == IS_ARRAY) {
zval tmp;
@ -1385,15 +1392,13 @@ static void add_config_entries(HashTable *hash, zval *return_value) /* {{{ */
/* {{{ Get the value of a PHP configuration option */
PHP_FUNCTION(get_cfg_var)
{
char *varname;
size_t varname_len;
zval *retval;
zend_string *varname;
ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_STRING(varname, varname_len)
Z_PARAM_STR(varname)
ZEND_PARSE_PARAMETERS_END();
retval = cfg_get_entry(varname, (uint32_t)varname_len);
zval *retval = cfg_get_entry_ex(varname);
if (retval) {
if (Z_TYPE_P(retval) == IS_ARRAY) {
@ -1401,7 +1406,7 @@ PHP_FUNCTION(get_cfg_var)
add_config_entries(Z_ARRVAL_P(retval), return_value);
return;
} else {
RETURN_STRING(Z_STRVAL_P(retval));
ZVAL_SET_INI_STR(return_value, Z_STR_P(retval));
}
} else {
RETURN_FALSE;
@ -1947,21 +1952,6 @@ PHP_FUNCTION(highlight_string)
}
/* }}} */
#define INI_RETVAL_STR(val) do { \
/* copy to return value here, because alter might free it! */ \
if (ZSTR_IS_INTERNED(val)) { \
RETVAL_INTERNED_STR(val); \
} else if (ZSTR_LEN(val) == 0) { \
RETVAL_EMPTY_STRING(); \
} else if (ZSTR_LEN(val) == 1) { \
RETVAL_CHAR(ZSTR_VAL(val)[0]); \
} else if (!(GC_FLAGS(val) & GC_PERSISTENT)) { \
ZVAL_NEW_STR(return_value, zend_string_copy(val)); \
} else { \
ZVAL_NEW_STR(return_value, zend_string_init(ZSTR_VAL(val), ZSTR_LEN(val), 0)); \
} \
} while (0)
/* {{{ Get a configuration option */
PHP_FUNCTION(ini_get)
{
@ -1977,7 +1967,7 @@ PHP_FUNCTION(ini_get)
RETURN_FALSE;
}
INI_RETVAL_STR(val);
ZVAL_SET_INI_STR(return_value, val);
}
/* }}} */
@ -2082,7 +2072,7 @@ PHP_FUNCTION(ini_set)
val = zend_ini_get_value(varname);
if (val) {
INI_RETVAL_STR(val);
ZVAL_SET_INI_STR(return_value, val);
} else {
RETVAL_FALSE;
}
@ -2116,8 +2106,6 @@ PHP_FUNCTION(ini_set)
}
/* }}} */
#undef INI_RETVAL_STR
/* {{{ Restore the value of a configuration option specified by varname */
PHP_FUNCTION(ini_restore)
{