Fixed bug #74878

php · Jul 7, 2017 · 9069734 · 9069734
1 parent 134047d
commit 9069734
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
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) {