php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 11:13:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

zts fix

Browse Source
This commit is contained in:
Dmitry Stogov
2006-08-02 07:54:41 +00:00
parent 263d329acd
commit be56f79c6f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/standard/array.c
+4 -4
View File
@@ -1390,7 +1390,7 @@ PHP_FUNCTION(extract)
ZVAL_LONG(&num, num_key);
convert_to_text(&num);
php_extract_prefix_varname(&final_name, prefix, Z_UNIVAL(num), Z_UNILEN(num), Z_TYPE(num));
php_extract_prefix_varname(&final_name, prefix, Z_UNIVAL(num), Z_UNILEN(num), Z_TYPE(num) TSRMLS_CC);
zval_dtor(&num);
} else {
zend_hash_move_forward_ex(Z_ARRVAL_P(var_array), &pos);
@@ -1414,7 +1414,7 @@ PHP_FUNCTION(extract)
case EXTR_PREFIX_IF_EXISTS:
if (var_exists) {
php_extract_prefix_varname(&final_name, prefix, var_name, var_name_len, key_type);
php_extract_prefix_varname(&final_name, prefix, var_name, var_name_len, key_type TSRMLS_CC);
}
break;
@@ -1426,14 +1426,14 @@ PHP_FUNCTION(extract)
case EXTR_PREFIX_ALL:
if (Z_TYPE(final_name) == IS_NULL && var_name_len != 0) {
php_extract_prefix_varname(&final_name, prefix, var_name, var_name_len, key_type);
php_extract_prefix_varname(&final_name, prefix, var_name, var_name_len, key_type TSRMLS_CC);
}
break;
case EXTR_PREFIX_INVALID:
if (Z_TYPE(final_name) == IS_NULL) {
if (!php_valid_var_name(var_name, var_name_len, key_type)) {
php_extract_prefix_varname(&final_name, prefix, var_name, var_name_len, key_type);
php_extract_prefix_varname(&final_name, prefix, var_name, var_name_len, key_type TSRMLS_CC);
} else {
ZVAL_TEXTL(&final_name, var_name, var_name_len, 1);
}