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

1 files changed, 9 insertions, 5 deletions

diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c
index b07901c470..c64de9839b 100644
--- a/Zend/zend_constants.c
+++ b/Zend/zend_constants.c
@@ -41,13 +41,17 @@ void free_zend_constant(zval *zv)
 
 	if (!(c->flags & CONST_PERSISTENT)) {
 		zval_ptr_dtor(&c->value);
+		if (c->name) {
+			zend_string_release_ex(c->name, 0);
+		}
+		efree(c);
 	} else {
 		zval_internal_dtor(&c->value);
+		if (c->name) {
+			zend_string_release_ex(c->name, 1);
+		}
+		free(c);
 	}
-	if (c->name) {
-		zend_string_release(c->name);
-	}
-	pefree(c, c->flags & CONST_PERSISTENT);
 }
 
 
@@ -378,7 +382,7 @@ ZEND_API zval *zend_get_constant_ex(zend_string *cname, zend_class_entry *scope,
 			}
 		}
 failure:
-		zend_string_release(class_name);
+		zend_string_release_ex(class_name, 0);
 		zend_string_efree(constant_name);
 		return ret_constant;
 	}