se zval_ptr_dtor_str() instead of zend_string_release_ex(Z_STR(*), 0)

dstogov · dstogov · commit af341213f736 · 2018-07-04T12:08:07.000+03:00
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -3169,7 +3169,7 @@ static zend_never_inline zend_op_array* ZEND_FASTCALL zend_include_or_eval(zval
 						zend_destroy_file_handle(&file_handle);
 						zend_string_release_ex(resolved_path, 0);
 						if (Z_TYPE(tmp_inc_filename) != IS_UNDEF) {
-							zend_string_release_ex(Z_STR(tmp_inc_filename), 0);
+							zval_ptr_dtor_str(&tmp_inc_filename);
 						}
 						return op_array;
 					} else {
@@ -3207,7 +3207,7 @@ static zend_never_inline zend_op_array* ZEND_FASTCALL zend_include_or_eval(zval
 	}
 
 	if (Z_TYPE(tmp_inc_filename) != IS_UNDEF) {
-		zend_string_release_ex(Z_STR(tmp_inc_filename), 0);
+		zval_ptr_dtor_str(&tmp_inc_filename);
 	}
 	return new_op_array;
 }
diff --git a/Zend/zend_highlight.c b/Zend/zend_highlight.c
@@ -156,7 +156,7 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini
 				case T_DOC_COMMENT:
 					break;
 				default:
-					zend_string_release_ex(Z_STR(token), 0);
+					zval_ptr_dtor_str(&token);
 					break;
 			}
 		}
@@ -219,7 +219,7 @@ ZEND_API void zend_strip(void)
 					break;
 
 				default:
-					zend_string_release_ex(Z_STR(token), 0);
+					zval_ptr_dtor_str(&token);
 					break;
 			}
 		}
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
@@ -572,7 +572,7 @@ ZEND_API uint32_t *zend_get_property_guard(zend_object *zobj, zend_string *membe
 		     EXPECTED(zend_string_equal_content(str, member)))) {
 			return &Z_PROPERTY_GUARD_P(zv);
 		} else if (EXPECTED(Z_PROPERTY_GUARD_P(zv) == 0)) {
-			zend_string_release_ex(Z_STR_P(zv), 0);
+			zval_ptr_dtor_str(zv);
 			ZVAL_STR_COPY(zv, member);
 			return &Z_PROPERTY_GUARD_P(zv);
 		} else {
@@ -581,7 +581,7 @@ ZEND_API uint32_t *zend_get_property_guard(zend_object *zobj, zend_string *membe
 			/* mark pointer as "special" using low bit */
 			zend_hash_add_new_ptr(guards, str,
 				(void*)(((zend_uintptr_t)&Z_PROPERTY_GUARD_P(zv)) | 1));
-			zend_string_release_ex(Z_STR_P(zv), 0);
+			zval_ptr_dtor_str(zv);
 			ZVAL_ARR(zv, guards);
 		}
 	} else if (EXPECTED(Z_TYPE_P(zv) == IS_ARRAY)) {
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c
@@ -60,7 +60,7 @@ ZEND_API void zend_object_std_dtor(zend_object *object)
 	}
 	if (UNEXPECTED(object->ce->ce_flags & ZEND_ACC_USE_GUARDS)) {
 		if (EXPECTED(Z_TYPE_P(p) == IS_STRING)) {
-			zend_string_release_ex(Z_STR_P(p), 0);
+			zval_ptr_dtor_str(p);
 		} else if (Z_TYPE_P(p) == IS_ARRAY) {
 			HashTable *guards;
 
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
@@ -1455,7 +1455,7 @@ ZEND_API int ZEND_FASTCALL bitwise_or_function(zval *result, zval *op1, zval *op
 			if (EXPECTED(Z_STRLEN_P(op1) == Z_STRLEN_P(op2)) && Z_STRLEN_P(op1) == 1) {
 				zend_uchar or = (zend_uchar) (*Z_STRVAL_P(op1) | *Z_STRVAL_P(op2));
 				if (result==op1) {
-					zend_string_release_ex(Z_STR_P(result), 0);
+					zval_ptr_dtor_str(result);
 				}
 				ZVAL_INTERNED_STR(result, ZSTR_CHAR(or));
 				return SUCCESS;
@@ -1473,7 +1473,7 @@ ZEND_API int ZEND_FASTCALL bitwise_or_function(zval *result, zval *op1, zval *op
 		}
 		memcpy(ZSTR_VAL(str) + i, Z_STRVAL_P(longer) + i, Z_STRLEN_P(longer) - i + 1);
 		if (result==op1) {
-			zend_string_release_ex(Z_STR_P(result), 0);
+			zval_ptr_dtor_str(result);
 		}
 		ZVAL_NEW_STR(result, str);
 		return SUCCESS;
@@ -1533,7 +1533,7 @@ ZEND_API int ZEND_FASTCALL bitwise_and_function(zval *result, zval *op1, zval *o
 			if (EXPECTED(Z_STRLEN_P(op1) == Z_STRLEN_P(op2)) && Z_STRLEN_P(op1) == 1) {
 				zend_uchar and = (zend_uchar) (*Z_STRVAL_P(op1) & *Z_STRVAL_P(op2));
 				if (result==op1) {
-					zend_string_release_ex(Z_STR_P(result), 0);
+					zval_ptr_dtor_str(result);
 				}
 				ZVAL_INTERNED_STR(result, ZSTR_CHAR(and));
 				return SUCCESS;
@@ -1551,7 +1551,7 @@ ZEND_API int ZEND_FASTCALL bitwise_and_function(zval *result, zval *op1, zval *o
 		}
 		ZSTR_VAL(str)[i] = 0;
 		if (result==op1) {
-			zend_string_release_ex(Z_STR_P(result), 0);
+			zval_ptr_dtor_str(result);
 		}
 		ZVAL_NEW_STR(result, str);
 		return SUCCESS;
@@ -1611,7 +1611,7 @@ ZEND_API int ZEND_FASTCALL bitwise_xor_function(zval *result, zval *op1, zval *o
 			if (EXPECTED(Z_STRLEN_P(op1) == Z_STRLEN_P(op2)) && Z_STRLEN_P(op1) == 1) {
 				zend_uchar xor = (zend_uchar) (*Z_STRVAL_P(op1) ^ *Z_STRVAL_P(op2));
 				if (result==op1) {
-					zend_string_release_ex(Z_STR_P(result), 0);
+					zval_ptr_dtor_str(result);
 				}
 				ZVAL_INTERNED_STR(result, ZSTR_CHAR(xor));
 				return SUCCESS;
@@ -1629,7 +1629,7 @@ ZEND_API int ZEND_FASTCALL bitwise_xor_function(zval *result, zval *op1, zval *o
 		}
 		ZSTR_VAL(str)[i] = 0;
 		if (result==op1) {
-			zend_string_release_ex(Z_STR_P(result), 0);
+			zval_ptr_dtor_str(result);
 		}
 		ZVAL_NEW_STR(result, str);
 		return SUCCESS;
@@ -2332,7 +2332,7 @@ static void ZEND_FASTCALL increment_string(zval *str) /* {{{ */
 	int ch;
 
 	if (Z_STRLEN_P(str) == 0) {
-		zend_string_release_ex(Z_STR_P(str), 0);
+		zval_ptr_dtor_str(str);
 		ZVAL_INTERNED_STR(str, ZSTR_CHAR('1'));
 		return;
 	}
@@ -2426,7 +2426,7 @@ ZEND_API int ZEND_FASTCALL increment_function(zval *op1) /* {{{ */
 
 				switch (is_numeric_string(Z_STRVAL_P(op1), Z_STRLEN_P(op1), &lval, &dval, 0)) {
 					case IS_LONG:
-						zend_string_release_ex(Z_STR_P(op1), 0);
+						zval_ptr_dtor_str(op1);
 						if (lval == ZEND_LONG_MAX) {
 							/* switch to double */
 							double d = (double)lval;
@@ -2436,7 +2436,7 @@ ZEND_API int ZEND_FASTCALL increment_function(zval *op1) /* {{{ */
 						}
 						break;
 					case IS_DOUBLE:
-						zend_string_release_ex(Z_STR_P(op1), 0);
+						zval_ptr_dtor_str(op1);
 						ZVAL_DOUBLE(op1, dval+1);
 						break;
 					default:
@@ -2493,13 +2493,13 @@ ZEND_API int ZEND_FASTCALL decrement_function(zval *op1) /* {{{ */
 			break;
 		case IS_STRING:		/* Like perl we only support string increment */
 			if (Z_STRLEN_P(op1) == 0) { /* consider as 0 */
-				zend_string_release_ex(Z_STR_P(op1), 0);
+				zval_ptr_dtor_str(op1);
 				ZVAL_LONG(op1, -1);
 				break;
 			}
 			switch (is_numeric_string(Z_STRVAL_P(op1), Z_STRLEN_P(op1), &lval, &dval, 0)) {
 				case IS_LONG:
-					zend_string_release_ex(Z_STR_P(op1), 0);
+					zval_ptr_dtor_str(op1);
 					if (lval == ZEND_LONG_MIN) {
 						double d = (double)lval;
 						ZVAL_DOUBLE(op1, d-1);
@@ -2508,7 +2508,7 @@ ZEND_API int ZEND_FASTCALL decrement_function(zval *op1) /* {{{ */
 					}
 					break;
 				case IS_DOUBLE:
-					zend_string_release_ex(Z_STR_P(op1), 0);
+					zval_ptr_dtor_str(op1);
 					ZVAL_DOUBLE(op1, dval - 1);
 					break;
 			}
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -4525,7 +4525,7 @@ ZEND_VM_C_LABEL(send_again):
 						ZEND_ASSERT(Z_TYPE(key) == IS_STRING);
 						zend_throw_error(NULL,
 							"Cannot unpack Traversable with string keys");
-						zend_string_release_ex(Z_STR(key), 0);
+						zval_ptr_dtor_str(&key);
 						break;
 					}
 				}
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
@@ -1362,7 +1362,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_UNPACK_SPEC_HANDLER(ZEND_
 						ZEND_ASSERT(Z_TYPE(key) == IS_STRING);
 						zend_throw_error(NULL,
 							"Cannot unpack Traversable with string keys");
-						zend_string_release_ex(Z_STR(key), 0);
+						zval_ptr_dtor_str(&key);
 						break;
 					}
 				}
diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c
@@ -704,7 +704,7 @@ static void zend_optimize_block(zend_basic_block *block, zend_op_array *op_array
 						Z_TYPE_INFO(ZEND_OP2_LITERAL(src)) = IS_STRING_EX;
 						memcpy(Z_STRVAL(ZEND_OP2_LITERAL(src)) + old_len, Z_STRVAL(ZEND_OP2_LITERAL(opline)), Z_STRLEN(ZEND_OP2_LITERAL(opline)));
 						Z_STRVAL(ZEND_OP2_LITERAL(src))[l] = '\0';
-						zend_string_release_ex(Z_STR(ZEND_OP2_LITERAL(opline)), 0);
+						zval_ptr_dtor_str(&ZEND_OP2_LITERAL(opline));
 						ZVAL_STR(&ZEND_OP2_LITERAL(opline), zend_new_interned_string(Z_STR(ZEND_OP2_LITERAL(src))));
 						ZVAL_NULL(&ZEND_OP2_LITERAL(src));
 						MAKE_NOP(src);
diff --git a/ext/session/session.c b/ext/session/session.c
@@ -1446,15 +1446,15 @@ PHPAPI int php_session_reset_id(void) /* {{{ */
 		smart_str_appends(&var, ZSTR_VAL(PS(id)));
 		smart_str_0(&var);
 		if (sid) {
-			zend_string_release_ex(Z_STR_P(sid), 0);
+			zval_ptr_dtor_str(sid);
 			ZVAL_NEW_STR(sid, var.s);
 		} else {
 			REGISTER_STRINGL_CONSTANT("SID", ZSTR_VAL(var.s), ZSTR_LEN(var.s), 0);
 			smart_str_free(&var);
 		}
 	} else {
 		if (sid) {
-			zend_string_release_ex(Z_STR_P(sid), 0);
+			zval_ptr_dtor_str(sid);
 			ZVAL_EMPTY_STRING(sid);
 		} else {
 			REGISTER_STRINGL_CONSTANT("SID", "", 0, 0);
diff --git a/ext/standard/array.c b/ext/standard/array.c
@@ -1947,7 +1947,7 @@ static zend_long php_extract_ref_prefix_if_exists(zend_array *arr, zend_array *s
 					count++;
 				}
 			}
-			zend_string_release_ex(Z_STR(final_name), 0);
+			zval_ptr_dtor_str(&final_name);
 		}
 	} ZEND_HASH_FOREACH_END();
 
@@ -1997,7 +1997,7 @@ static zend_long php_extract_prefix_if_exists(zend_array *arr, zend_array *symbo
 					count++;
 				}
 			}
-			zend_string_release_ex(Z_STR(final_name), 0);
+			zval_ptr_dtor_str(&final_name);
 		}
 	} ZEND_HASH_FOREACH_END();
 
@@ -2056,7 +2056,7 @@ static zend_long php_extract_ref_prefix_same(zend_array *arr, zend_array *symbol
 					count++;
 				}
 			}
-			zend_string_release_ex(Z_STR(final_name), 0);
+			zval_ptr_dtor_str(&final_name);
 		} else {
 			if (!php_valid_var_name(ZSTR_VAL(var_name), ZSTR_LEN(var_name))) {
 				continue;
@@ -2124,7 +2124,7 @@ static zend_long php_extract_prefix_same(zend_array *arr, zend_array *symbol_tab
 					count++;
 				}
 			}
-			zend_string_release_ex(Z_STR(final_name), 0);
+			zval_ptr_dtor_str(&final_name);
 		} else {
 			if (!php_valid_var_name(ZSTR_VAL(var_name), ZSTR_LEN(var_name))) {
 				continue;
@@ -2184,7 +2184,7 @@ static zend_long php_extract_ref_prefix_all(zend_array *arr, zend_array *symbol_
 				count++;
 			}
 		}
-		zend_string_release_ex(Z_STR(final_name), 0);
+		zval_ptr_dtor_str(&final_name);
 	} ZEND_HASH_FOREACH_END();
 
 	return count;
@@ -2229,7 +2229,7 @@ static zend_long php_extract_prefix_all(zend_array *arr, zend_array *symbol_tabl
 				count++;
 			}
 		}
-		zend_string_release_ex(Z_STR(final_name), 0);
+		zval_ptr_dtor_str(&final_name);
 	} ZEND_HASH_FOREACH_END();
 
 	return count;
@@ -2248,7 +2248,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_ex(Z_STR(final_name), 0);
+					zval_ptr_dtor_str(&final_name);
 					continue;
 				}
 			} else {
@@ -2259,7 +2259,7 @@ static zend_long php_extract_ref_prefix_invalid(zend_array *arr, zend_array *sym
 			php_prefix_varname(&final_name, prefix, ZSTR_VAL(str), ZSTR_LEN(str), 1);
 			zend_string_release_ex(str, 0);
 			if (!php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {
-				zend_string_release_ex(Z_STR(final_name), 0);
+				zval_ptr_dtor_str(&final_name);
 				continue;
 			}
 		}
@@ -2283,7 +2283,7 @@ static zend_long php_extract_ref_prefix_invalid(zend_array *arr, zend_array *sym
 			}
 			count++;
 		}
-		zend_string_release_ex(Z_STR(final_name), 0);
+		zval_ptr_dtor_str(&final_name);
 	} ZEND_HASH_FOREACH_END();
 
 	return count;
@@ -2302,7 +2302,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_ex(Z_STR(final_name), 0);
+					zval_ptr_dtor_str(&final_name);
 					continue;
 				}
 			} else {
@@ -2313,7 +2313,7 @@ static zend_long php_extract_prefix_invalid(zend_array *arr, zend_array *symbol_
 			php_prefix_varname(&final_name, prefix, ZSTR_VAL(str), ZSTR_LEN(str), 1);
 			zend_string_release_ex(str, 0);
 			if (!php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {
-				zend_string_release_ex(Z_STR(final_name), 0);
+				zval_ptr_dtor_str(&final_name);
 				continue;
 			}
 		}
@@ -2335,7 +2335,7 @@ static zend_long php_extract_prefix_invalid(zend_array *arr, zend_array *symbol_
 			}
 			count++;
 		}
-		zend_string_release_ex(Z_STR(final_name), 0);
+		zval_ptr_dtor_str(&final_name);
 	} ZEND_HASH_FOREACH_END();
 
 	return count;
diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
@@ -477,7 +477,7 @@ static zend_always_inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTab
 							ZEND_ASSERT(existing_propinfo->flags & ZEND_ACC_PUBLIC);
 							new_key = unmangled;
 						}
-						zend_string_release_ex(Z_STR(key), 0);
+						zval_ptr_dtor_str(&key);
 						ZVAL_STR(&key, new_key);
 					} else {
 						zend_string_release_ex(unmangled, 0);
diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re
@@ -481,7 +481,7 @@ string_key:
 							ZEND_ASSERT(existing_propinfo->flags & ZEND_ACC_PUBLIC);
 							new_key = unmangled;
 						}
-						zend_string_release_ex(Z_STR(key), 0);
+						zval_ptr_dtor_str(&key);
 						ZVAL_STR(&key, new_key);
 					} else {
 						zend_string_release_ex(unmangled, 0);

Original file line number	Diff line number	Diff line change
`@@ -3169,7 +3169,7 @@ static zend_never_inline zend_op_array* ZEND_FASTCALL zend_include_or_eval(zval`
`3169`	`3169`	`zend_destroy_file_handle(&file_handle);`
`3170`	`3170`	`zend_string_release_ex(resolved_path, 0);`
`3171`	`3171`	`if (Z_TYPE(tmp_inc_filename) != IS_UNDEF) {`
`3172`		`- zend_string_release_ex(Z_STR(tmp_inc_filename), 0);`
	`3172`	`+ zval_ptr_dtor_str(&tmp_inc_filename);`
`3173`	`3173`	`}`
`3174`	`3174`	`return op_array;`
`3175`	`3175`	`} else {`
`@@ -3207,7 +3207,7 @@ static zend_never_inline zend_op_array* ZEND_FASTCALL zend_include_or_eval(zval`
`3207`	`3207`	`}`
`3208`	`3208`
`3209`	`3209`	`if (Z_TYPE(tmp_inc_filename) != IS_UNDEF) {`
`3210`		`- zend_string_release_ex(Z_STR(tmp_inc_filename), 0);`
	`3210`	`+ zval_ptr_dtor_str(&tmp_inc_filename);`
`3211`	`3211`	`}`
`3212`	`3212`	`return new_op_array;`
`3213`	`3213`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ ZEND_API void zend_highlight(zend_syntax_highlighter_ini *syntax_highlighter_ini`
`156`	`156`	`case T_DOC_COMMENT:`
`157`	`157`	`break;`
`158`	`158`	`default:`
`159`		`- zend_string_release_ex(Z_STR(token), 0);`
	`159`	`+ zval_ptr_dtor_str(&token);`
`160`	`160`	`break;`
`161`	`161`	`}`
`162`	`162`	`}`
`@@ -219,7 +219,7 @@ ZEND_API void zend_strip(void)`
`219`	`219`	`break;`
`220`	`220`
`221`	`221`	`default:`
`222`		`- zend_string_release_ex(Z_STR(token), 0);`
	`222`	`+ zval_ptr_dtor_str(&token);`
`223`	`223`	`break;`
`224`	`224`	`}`
`225`	`225`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ ZEND_API void zend_object_std_dtor(zend_object *object)`
`60`	`60`	`}`
`61`	`61`	`if (UNEXPECTED(object->ce->ce_flags & ZEND_ACC_USE_GUARDS)) {`
`62`	`62`	`if (EXPECTED(Z_TYPE_P(p) == IS_STRING)) {`
`63`		`- zend_string_release_ex(Z_STR_P(p), 0);`
	`63`	`+ zval_ptr_dtor_str(p);`
`64`	`64`	`} else if (Z_TYPE_P(p) == IS_ARRAY) {`
`65`	`65`	`HashTable *guards;`
`66`	`66`
Original file line number	Diff line number	Diff line change
`@@ -4525,7 +4525,7 @@ ZEND_VM_C_LABEL(send_again):`
`4525`	`4525`	`ZEND_ASSERT(Z_TYPE(key) == IS_STRING);`
`4526`	`4526`	`zend_throw_error(NULL,`
`4527`	`4527`	`"Cannot unpack Traversable with string keys");`
`4528`		`- zend_string_release_ex(Z_STR(key), 0);`
	`4528`	`+ zval_ptr_dtor_str(&key);`
`4529`	`4529`	`break;`
`4530`	`4530`	`}`
`4531`	`4531`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1362,7 +1362,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_UNPACK_SPEC_HANDLER(ZEND_`
`1362`	`1362`	`ZEND_ASSERT(Z_TYPE(key) == IS_STRING);`
`1363`	`1363`	`zend_throw_error(NULL,`
`1364`	`1364`	`"Cannot unpack Traversable with string keys");`
`1365`		`- zend_string_release_ex(Z_STR(key), 0);`
	`1365`	`+ zval_ptr_dtor_str(&key);`
`1366`	`1366`	`break;`
`1367`	`1367`	`}`
`1368`	`1368`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1947,7 +1947,7 @@ static zend_long php_extract_ref_prefix_if_exists(zend_array arr, zend_array s`
`1947`	`1947`	`count++;`
`1948`	`1948`	`}`
`1949`	`1949`	`}`
`1950`		`- zend_string_release_ex(Z_STR(final_name), 0);`
	`1950`	`+ zval_ptr_dtor_str(&final_name);`
`1951`	`1951`	`}`
`1952`	`1952`	`} ZEND_HASH_FOREACH_END();`
`1953`	`1953`
`@@ -1997,7 +1997,7 @@ static zend_long php_extract_prefix_if_exists(zend_array arr, zend_array symbo`
`1997`	`1997`	`count++;`
`1998`	`1998`	`}`
`1999`	`1999`	`}`
`2000`		`- zend_string_release_ex(Z_STR(final_name), 0);`
	`2000`	`+ zval_ptr_dtor_str(&final_name);`
`2001`	`2001`	`}`
`2002`	`2002`	`} ZEND_HASH_FOREACH_END();`
`2003`	`2003`
`@@ -2056,7 +2056,7 @@ static zend_long php_extract_ref_prefix_same(zend_array arr, zend_array symbol`
`2056`	`2056`	`count++;`
`2057`	`2057`	`}`
`2058`	`2058`	`}`
`2059`		`- zend_string_release_ex(Z_STR(final_name), 0);`
	`2059`	`+ zval_ptr_dtor_str(&final_name);`
`2060`	`2060`	`} else {`
`2061`	`2061`	`if (!php_valid_var_name(ZSTR_VAL(var_name), ZSTR_LEN(var_name))) {`
`2062`	`2062`	`continue;`
`@@ -2124,7 +2124,7 @@ static zend_long php_extract_prefix_same(zend_array arr, zend_array symbol_tab`
`2124`	`2124`	`count++;`
`2125`	`2125`	`}`
`2126`	`2126`	`}`
`2127`		`- zend_string_release_ex(Z_STR(final_name), 0);`
	`2127`	`+ zval_ptr_dtor_str(&final_name);`
`2128`	`2128`	`} else {`
`2129`	`2129`	`if (!php_valid_var_name(ZSTR_VAL(var_name), ZSTR_LEN(var_name))) {`
`2130`	`2130`	`continue;`
`@@ -2184,7 +2184,7 @@ static zend_long php_extract_ref_prefix_all(zend_array arr, zend_array symbol_`
`2184`	`2184`	`count++;`
`2185`	`2185`	`}`
`2186`	`2186`	`}`
`2187`		`- zend_string_release_ex(Z_STR(final_name), 0);`
	`2187`	`+ zval_ptr_dtor_str(&final_name);`
`2188`	`2188`	`} ZEND_HASH_FOREACH_END();`
`2189`	`2189`
`2190`	`2190`	`return count;`
`@@ -2229,7 +2229,7 @@ static zend_long php_extract_prefix_all(zend_array arr, zend_array symbol_tabl`
`2229`	`2229`	`count++;`
`2230`	`2230`	`}`
`2231`	`2231`	`}`
`2232`		`- zend_string_release_ex(Z_STR(final_name), 0);`
	`2232`	`+ zval_ptr_dtor_str(&final_name);`
`2233`	`2233`	`} ZEND_HASH_FOREACH_END();`
`2234`	`2234`
`2235`	`2235`	`return count;`
`@@ -2248,7 +2248,7 @@ static zend_long php_extract_ref_prefix_invalid(zend_array arr, zend_array sym`
`2248`	`2248`	`if (!php_valid_var_name(ZSTR_VAL(var_name), ZSTR_LEN(var_name))) {`
`2249`	`2249`	`php_prefix_varname(&final_name, prefix, ZSTR_VAL(var_name), ZSTR_LEN(var_name), 1);`
`2250`	`2250`	`if (!php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {`
`2251`		`- zend_string_release_ex(Z_STR(final_name), 0);`
	`2251`	`+ zval_ptr_dtor_str(&final_name);`
`2252`	`2252`	`continue;`
`2253`	`2253`	`}`
`2254`	`2254`	`} else {`
`@@ -2259,7 +2259,7 @@ static zend_long php_extract_ref_prefix_invalid(zend_array arr, zend_array sym`
`2259`	`2259`	`php_prefix_varname(&final_name, prefix, ZSTR_VAL(str), ZSTR_LEN(str), 1);`
`2260`	`2260`	`zend_string_release_ex(str, 0);`
`2261`	`2261`	`if (!php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {`
`2262`		`- zend_string_release_ex(Z_STR(final_name), 0);`
	`2262`	`+ zval_ptr_dtor_str(&final_name);`
`2263`	`2263`	`continue;`
`2264`	`2264`	`}`
`2265`	`2265`	`}`
`@@ -2283,7 +2283,7 @@ static zend_long php_extract_ref_prefix_invalid(zend_array arr, zend_array sym`
`2283`	`2283`	`}`
`2284`	`2284`	`count++;`
`2285`	`2285`	`}`
`2286`		`- zend_string_release_ex(Z_STR(final_name), 0);`
	`2286`	`+ zval_ptr_dtor_str(&final_name);`
`2287`	`2287`	`} ZEND_HASH_FOREACH_END();`
`2288`	`2288`
`2289`	`2289`	`return count;`
`@@ -2302,7 +2302,7 @@ static zend_long php_extract_prefix_invalid(zend_array arr, zend_array symbol_`
`2302`	`2302`	`if (!php_valid_var_name(ZSTR_VAL(var_name), ZSTR_LEN(var_name))) {`
`2303`	`2303`	`php_prefix_varname(&final_name, prefix, ZSTR_VAL(var_name), ZSTR_LEN(var_name), 1);`
`2304`	`2304`	`if (!php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {`
`2305`		`- zend_string_release_ex(Z_STR(final_name), 0);`
	`2305`	`+ zval_ptr_dtor_str(&final_name);`
`2306`	`2306`	`continue;`
`2307`	`2307`	`}`
`2308`	`2308`	`} else {`
`@@ -2313,7 +2313,7 @@ static zend_long php_extract_prefix_invalid(zend_array arr, zend_array symbol_`
`2313`	`2313`	`php_prefix_varname(&final_name, prefix, ZSTR_VAL(str), ZSTR_LEN(str), 1);`
`2314`	`2314`	`zend_string_release_ex(str, 0);`
`2315`	`2315`	`if (!php_valid_var_name(Z_STRVAL(final_name), Z_STRLEN(final_name))) {`
`2316`		`- zend_string_release_ex(Z_STR(final_name), 0);`
	`2316`	`+ zval_ptr_dtor_str(&final_name);`
`2317`	`2317`	`continue;`
`2318`	`2318`	`}`
`2319`	`2319`	`}`
`@@ -2335,7 +2335,7 @@ static zend_long php_extract_prefix_invalid(zend_array arr, zend_array symbol_`
`2335`	`2335`	`}`
`2336`	`2336`	`count++;`
`2337`	`2337`	`}`
`2338`		`- zend_string_release_ex(Z_STR(final_name), 0);`
	`2338`	`+ zval_ptr_dtor_str(&final_name);`
`2339`	`2339`	`} ZEND_HASH_FOREACH_END();`
`2340`	`2340`
`2341`	`2341`	`return count;`