diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-09-18 11:27:10 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-09-18 11:27:10 +0300 |
| commit | 41e5f916bffaf59b3a2374511e45cb7a22bb2665 (patch) | |
| tree | 18825ab88dd055fedc85518a2fcc17a10657cb33 | |
| parent | de2f28ede1ad63a93ae342d76f99c3066c6374b9 (diff) | |
| download | php-git-41e5f916bffaf59b3a2374511e45cb7a22bb2665.tar.gz | |
Fixed bug #74878 (Data race in ZTS builds)
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | Zend/zend_API.c | 4 |
2 files changed, 7 insertions, 0 deletions
@@ -2,6 +2,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? ????, PHP 7.2.0RC3 +- Core + . Fixed bug #74878 (Data race in ZTS builds). (Nikita, Dmitry) + - MySQLi: . Fixed bug #75018 (Data corruption when reading fields of bit type). (Anatol) 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) { |