From: Dmitry Stogov Date: Wed, 2 Aug 2006 07:54:41 +0000 (+0000) Subject: zts fix X-Git-Tag: RELEASE_1_0_0RC1~2135 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=be56f79c6f954c287a273dc3eb4e7e765679a21d;p=php zts fix --- diff --git a/ext/standard/array.c b/ext/standard/array.c index 4c38bc7733..7934533144 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -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); }