From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 30 May 2019 21:59:52 +0000 (+0300)
Subject: Fixed compilation warning
X-Git-Tag: php-7.4.0alpha1~138
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2915a32f374f8ec60915cf7398d5227d9bda43cd;p=php

Fixed compilation warning
---

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 5689cf27fa..b4d41dfa59 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -5926,7 +5926,7 @@ ZEND_VM_COLD_HANDLER(179, ZEND_UNSET_STATIC_PROP, ANY, ANY, CACHE_SLOT)
 {
 	USE_OPLINE
 	zval *varname;
-	zend_string *name, *tmp_name;
+	zend_string *name, *tmp_name = NULL;
 	zend_class_entry *ce;
 	zend_free_op free_op1;
 
@@ -5959,7 +5959,6 @@ ZEND_VM_COLD_HANDLER(179, ZEND_UNSET_STATIC_PROP, ANY, ANY, CACHE_SLOT)
 		name = Z_STR_P(varname);
 	} else if (EXPECTED(Z_TYPE_P(varname) == IS_STRING)) {
 		name = Z_STR_P(varname);
-		tmp_name = NULL;
 	} else {
 		if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_P(varname) == IS_UNDEF)) {
 			varname = ZVAL_UNDEFINED_OP1();
@@ -5969,9 +5968,7 @@ ZEND_VM_COLD_HANDLER(179, ZEND_UNSET_STATIC_PROP, ANY, ANY, CACHE_SLOT)
 
 	zend_std_unset_static_property(ce, name);
 
-	if (OP1_TYPE != IS_CONST) {
-		zend_tmp_string_release(tmp_name);
-	}
+	zend_tmp_string_release(tmp_name);
 	FREE_OP1();
 	ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 }
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index c5b22c0094..b967d281dc 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1940,7 +1940,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_UNSET_STATIC_PROP
 {
 	USE_OPLINE
 	zval *varname;
-	zend_string *name, *tmp_name;
+	zend_string *name, *tmp_name = NULL;
 	zend_class_entry *ce;
 	zend_free_op free_op1;
 
@@ -1973,7 +1973,6 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_UNSET_STATIC_PROP
 		name = Z_STR_P(varname);
 	} else if (EXPECTED(Z_TYPE_P(varname) == IS_STRING)) {
 		name = Z_STR_P(varname);
-		tmp_name = NULL;
 	} else {
 		if (opline->op1_type == IS_CV && UNEXPECTED(Z_TYPE_P(varname) == IS_UNDEF)) {
 			varname = ZVAL_UNDEFINED_OP1();
@@ -1983,9 +1982,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_UNSET_STATIC_PROP
 
 	zend_std_unset_static_property(ce, name);
 
-	if (opline->op1_type != IS_CONST) {
-		zend_tmp_string_release(tmp_name);
-	}
+	zend_tmp_string_release(tmp_name);
 	FREE_OP(free_op1);
 	ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 }