Use zend_string_release_ex() instread of zend_string_release() in places, where we sure about string persistence.

1 files changed, 18 insertions, 18 deletions

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 7621b0616a..55d338faad 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -1966,7 +1966,7 @@ static zend_long php_extract_ref_prefix_if_exists(zend_array *arr, zend_array *s
 					count++;
 				}
 			}
-			zend_string_release(Z_STR(final_name));
+			zend_string_release_ex(Z_STR(final_name), 0);
 		}
 	} ZEND_HASH_FOREACH_END();
 
@@ -2019,7 +2019,7 @@ static zend_long php_extract_prefix_if_exists(zend_array *arr, zend_array *symbo
 					count++;
 				}
 			}
-			zend_string_release(Z_STR(final_name));
+			zend_string_release_ex(Z_STR(final_name), 0);
 		}
 	} ZEND_HASH_FOREACH_END();
 
@@ -2081,7 +2081,7 @@ static zend_long php_extract_ref_prefix_same(zend_array *arr, zend_array *symbol
 					count++;
 				}
 			}
-			zend_string_release(Z_STR(final_name));
+			zend_string_release_ex(Z_STR(final_name), 0);
 		} else {
 			if (!php_valid_var_name(ZSTR_VAL(var_name), ZSTR_LEN(var_name))) {
 				continue;
@@ -2155,7 +2155,7 @@ static zend_long php_extract_prefix_same(zend_array *arr, zend_array *symbol_tab
 					count++;
 				}
 			}
-			zend_string_release(Z_STR(final_name));
+			zend_string_release_ex(Z_STR(final_name), 0);
 		} else {
 			if (!php_valid_var_name(ZSTR_VAL(var_name), ZSTR_LEN(var_name))) {
 				continue;
@@ -2195,7 +2195,7 @@ static zend_long php_extract_ref_prefix_all(zend_array *arr, zend_array *symbol_
 		} else {
 			zend_string *str = zend_long_to_str(num_key);
 			php_prefix_varname(&final_name, prefix, ZSTR_VAL(str), ZSTR_LEN(str), 1);
-			zend_string_release(str);
+			zend_string_release_ex(str, 0);
 		}
 		if (php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {
 			if (zend_string_equals_literal(Z_STR(final_name), "this")) {
@@ -2221,7 +2221,7 @@ static zend_long php_extract_ref_prefix_all(zend_array *arr, zend_array *symbol_
 				count++;
 			}
 		}
-		zend_string_release(Z_STR(final_name));
+		zend_string_release_ex(Z_STR(final_name), 0);
 	} ZEND_HASH_FOREACH_END();
 
 	return count;
@@ -2245,7 +2245,7 @@ static zend_long php_extract_prefix_all(zend_array *arr, zend_array *symbol_tabl
 		} else {
 			zend_string *str = zend_long_to_str(num_key);
 			php_prefix_varname(&final_name, prefix, ZSTR_VAL(str), ZSTR_LEN(str), 1);
-			zend_string_release(str);
+			zend_string_release_ex(str, 0);
 		}
 		if (php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {
 			if (zend_string_equals_literal(Z_STR(final_name), "this")) {
@@ -2269,7 +2269,7 @@ static zend_long php_extract_prefix_all(zend_array *arr, zend_array *symbol_tabl
 				count++;
 			}
 		}
-		zend_string_release(Z_STR(final_name));
+		zend_string_release_ex(Z_STR(final_name), 0);
 	} ZEND_HASH_FOREACH_END();
 
 	return count;
@@ -2289,7 +2289,7 @@ static zend_long php_extract_ref_prefix_invalid(zend_array *arr, zend_array *sym
 			if (!php_valid_var_name(ZSTR_VAL(var_name), ZSTR_LEN(var_name))) {
 				php_prefix_varname(&final_name, prefix, ZSTR_VAL(var_name), ZSTR_LEN(var_name), 1);
 				if (!php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {
-					zend_string_release(Z_STR(final_name));
+					zend_string_release_ex(Z_STR(final_name), 0);
 					continue;
 				}
 			} else {
@@ -2298,9 +2298,9 @@ static zend_long php_extract_ref_prefix_invalid(zend_array *arr, zend_array *sym
 		} else {
 			zend_string *str = zend_long_to_str(num_key);
 			php_prefix_varname(&final_name, prefix, ZSTR_VAL(str), ZSTR_LEN(str), 1);
-			zend_string_release(str);
+			zend_string_release_ex(str, 0);
 			if (!php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {
-				zend_string_release(Z_STR(final_name));
+				zend_string_release_ex(Z_STR(final_name), 0);
 				continue;
 			}
 		}
@@ -2326,7 +2326,7 @@ static zend_long php_extract_ref_prefix_invalid(zend_array *arr, zend_array *sym
 			}
 			count++;
 		}
-		zend_string_release(Z_STR(final_name));
+		zend_string_release_ex(Z_STR(final_name), 0);
 	} ZEND_HASH_FOREACH_END();
 
 	return count;
@@ -2346,7 +2346,7 @@ static zend_long php_extract_prefix_invalid(zend_array *arr, zend_array *symbol_
 			if (!php_valid_var_name(ZSTR_VAL(var_name), ZSTR_LEN(var_name))) {
 				php_prefix_varname(&final_name, prefix, ZSTR_VAL(var_name), ZSTR_LEN(var_name), 1);
 				if (!php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {
-					zend_string_release(Z_STR(final_name));
+					zend_string_release_ex(Z_STR(final_name), 0);
 					continue;
 				}
 			} else {
@@ -2355,9 +2355,9 @@ static zend_long php_extract_prefix_invalid(zend_array *arr, zend_array *symbol_
 		} else {
 			zend_string *str = zend_long_to_str(num_key);
 			php_prefix_varname(&final_name, prefix, ZSTR_VAL(str), ZSTR_LEN(str), 1);
-			zend_string_release(str);
+			zend_string_release_ex(str, 0);
 			if (!php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {
-				zend_string_release(Z_STR(final_name));
+				zend_string_release_ex(Z_STR(final_name), 0);
 				continue;
 			}
 		}
@@ -2381,7 +2381,7 @@ static zend_long php_extract_prefix_invalid(zend_array *arr, zend_array *symbol_
 			}
 			count++;
 		}
-		zend_string_release(Z_STR(final_name));
+		zend_string_release_ex(Z_STR(final_name), 0);
 	} ZEND_HASH_FOREACH_END();
 
 	return count;
@@ -3040,7 +3040,7 @@ static void php_array_data_shuffle(zval *array) /* {{{ */
 	for (j = 0; j < n_elems; j++) {
 		p = hash->arData + j;
 		if (p->key) {
-			zend_string_release(p->key);
+			zend_string_release_ex(p->key, 0);
 		}
 		p->h = j;
 		p->key = NULL;
@@ -4445,7 +4445,7 @@ PHP_FUNCTION(array_change_key_case)
 				new_key = php_string_tolower(string_key);
 			}
 			entry = zend_hash_update(Z_ARRVAL_P(return_value), new_key, entry);
-			zend_string_release(new_key);
+			zend_string_release_ex(new_key, 0);
 		}
 
 		zval_add_ref(entry);