Fixed bug #74878

diff --git a/NEWS b/NEWS
index 0c100252998d08b7e6a5d4989db2d7d20ba163f8..6df4666626f3eaa8f9fc82cb4d83114b520719ea 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ 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)
        
 - EXIF:
   . Fixed bug #74428 (exif_read_data(): "Illegal IFD size" warning occurs with 

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index ca8b4e2f9974f43ce4e3105f374410d8bcc4fc34..609e8b4a515a3ac71c6ea1d720a9941229d8f9da 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -3742,6 +3742,10 @@ 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) {