summaryrefslogtreecommitdiff
path: root/Zend/zend_API.c
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2017-07-07 22:41:48 +0200
committerNikita Popov <nikita.ppv@gmail.com>2017-07-07 22:41:48 +0200
commit9069734b57a556a23f977915ee2819477c6d6720 (patch)
tree05f35a09fa25586eeb162dbd460d0b1ff6732342 /Zend/zend_API.c
parent134047dfde1feaf664b54bb2f84324a38eced091 (diff)
downloadphp-git-9069734b57a556a23f977915ee2819477c6d6720.tar.gz
Fixed bug #74878
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..609e8b4a51 100644
--- 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) {