diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-07-07 22:41:48 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-07-07 22:41:48 +0200 |
| commit | 9069734b57a556a23f977915ee2819477c6d6720 (patch) | |
| tree | 05f35a09fa25586eeb162dbd460d0b1ff6732342 | |
| parent | 134047dfde1feaf664b54bb2f84324a38eced091 (diff) | |
| download | php-git-9069734b57a556a23f977915ee2819477c6d6720.tar.gz | |
Fixed bug #74878
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | Zend/zend_API.c | 4 |
2 files changed, 5 insertions, 0 deletions
@@ -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 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) { |