summaryrefslogtreecommitdiff
path: root/Zend/zend_API.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2017-09-18 11:27:10 +0300
committerDmitry Stogov <dmitry@zend.com>2017-09-18 11:27:10 +0300
commit41e5f916bffaf59b3a2374511e45cb7a22bb2665 (patch)
tree18825ab88dd055fedc85518a2fcc17a10657cb33 /Zend/zend_API.c
parentde2f28ede1ad63a93ae342d76f99c3066c6374b9 (diff)
downloadphp-git-41e5f916bffaf59b3a2374511e45cb7a22bb2665.tar.gz
Fixed bug #74878 (Data race in ZTS builds)
Diffstat (limited to 'Zend/zend_API.c')
-rw-r--r--Zend/zend_API.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index ca8b4e2f99..7c82d6ec25 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -3741,7 +3741,11 @@ ZEND_API int zend_declare_property_ex(zend_class_entry *ce, zend_string *name, z
default:
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) {