From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 17 Dec 2019 07:13:13 +0000 (+0300)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b1f08079b5abaad68902129bdaa573c2850f7fdc;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Property names of internal classes from temporary extensins, loaded by dl(), may be emalloc-ed strings.
---

b1f08079b5abaad68902129bdaa573c2850f7fdc
diff --cc Zend/zend_compile.c
index 43edd438bb,ea24457394..be218e9e69
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@@ -126,8 -122,7 +126,8 @@@ static void zend_destroy_property_info_
  {
  	zend_property_info *property_info = Z_PTR_P(zv);
  
- 	zend_string_release_ex(property_info->name, 1);
+ 	zend_string_release(property_info->name);
 +	zend_type_release(property_info->type, /* persistent */ 1);
  	free(property_info);
  }
  /* }}} */