diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-03-21 16:22:02 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-03-21 16:22:02 +0800 |
| commit | 1e5ac8940a68188413d9e49cdffd267a05a35c28 (patch) | |
| tree | 62865ae6eb7343cd4b660be79243e68b79b54928 /Zend/zend_builtin_functions.c | |
| parent | 85ccebc1c21d57fb996b08d5a1ceda26ad86b010 (diff) | |
| parent | 65ae7440b026440835f6fdc5d19ea9e0fde41436 (diff) | |
| download | php-git-1e5ac8940a68188413d9e49cdffd267a05a35c28.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
Fix bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializable)
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 0b48df48bf..a35c519c03 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1249,7 +1249,7 @@ ZEND_FUNCTION(get_object_vars) zobj = Z_OBJ_P(obj); - if (!zobj->ce->default_properties_count && properties == zobj->properties) { + if (!zobj->ce->default_properties_count && properties == zobj->properties && !ZEND_HASH_GET_APPLY_COUNT(properties)) { /* fast copy */ if (EXPECTED(zobj->handlers == &std_object_handlers)) { if (EXPECTED(!(GC_FLAGS(properties) & IS_ARRAY_IMMUTABLE))) { |