Fixed bug #74878

nikic · nikic · commit 9069734b57a5 · 2017-07-07T22:41:48.000+02:00
diff --git 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
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -3742,6 +3742,10 @@ ZEND_API int zend_declare_property_ex(zend_class_entry ce, zend_string name, z`
`3742`	`3742`	`break;`
`3743`	`3743`	`}`
`3744`	`3744`	`}`
	`3745`	`+`
	`3746`	`+ /* Must be interned to avoid ZTS data races */`
	`3747`	`+ name = zend_new_interned_string(zend_string_copy(name));`
	`3748`	`+`
`3745`	`3749`	`if (access_type & ZEND_ACC_PUBLIC) {`
`3746`	`3750`	`property_info->name = zend_string_copy(name);`
`3747`	`3751`	`} else if (access_type & ZEND_ACC_PRIVATE) {`