diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-03-21 16:03:16 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-03-21 16:03:16 +0800 |
| commit | 65ae7440b026440835f6fdc5d19ea9e0fde41436 (patch) | |
| tree | d2ff55b0ebe81b4aefe5817be00f74452532dee4 /Zend/zend_builtin_functions.c | |
| parent | c4517b2a5e3141393c1c4f6fca51e1c325e91251 (diff) | |
| parent | 7e069daa89f05c1fa4127b2cedfd5586dbfc810e (diff) | |
| download | php-git-65ae7440b026440835f6fdc5d19ea9e0fde41436.tar.gz | |
Merge branch 'bug71835' of https://github.com/bukka/php-src into PHP-7.0
* 'bug71835' of https://github.com/bukka/php-src:
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 231424f1de..a576455fa3 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1183,7 +1183,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))) { |