From 161c378cc861fe01ea0034f5a6e8d32ad14f5ccb Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Mon, 10 Jul 2017 12:21:58 +0300 Subject: [PATCH] Revert "Fixed bug #74878" This reverts commit 9069734b57a556a23f977915ee2819477c6d6720. --- NEWS | 1 - Zend/zend_API.c | 4 ---- 2 files changed, 5 deletions(-) diff --git a/NEWS b/NEWS index 70eb771556..d9bd26e0bd 100644 --- a/NEWS +++ b/NEWS @@ -9,7 +9,6 @@ PHP NEWS unserialize). (Nikita) . Fixed bug #74819 (wddx_deserialize() heap out-of-bound read via php_parse_date()). (Derick) - . Fixed bug #74878 (Data race in ZTS builds). (Nikita) . Fixed bug #49649 (unserialize() doesn't handle changes in property visibility). (pmmaga) diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 609e8b4a51..ca8b4e2f99 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -3742,10 +3742,6 @@ ZEND_API int zend_declare_property_ex(zend_class_entry *ce, zend_string *name, z break; } } - - /* Must be interned to avoid ZTS data races */ - name = zend_new_interned_string(zend_string_copy(name)); - if (access_type & ZEND_ACC_PUBLIC) { property_info->name = zend_string_copy(name); } else if (access_type & ZEND_ACC_PRIVATE) { -- 2.50.1