From 7e069daa89f05c1fa4127b2cedfd5586dbfc810e Mon Sep 17 00:00:00 2001 From: Jakub Zelenka Date: Sun, 20 Mar 2016 15:53:57 +0000 Subject: Fix bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializable) --- Zend/zend_builtin_functions.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Zend/zend_builtin_functions.c') 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))) { -- cgit v1.2.1