- MFH Bug #29505 get_class_vars() severely broken when used with arrays

diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 734baf522a092e0b6653754da833ac7c7ba19612..791159f61921eadcec478a9246f2f87138d5b429 100644 (file)
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -701,6 +701,12 @@ ZEND_FUNCTION(get_class_vars)
                                zval_copy_ctor(prop_copy);
                                INIT_PZVAL(prop_copy);
        
+                               /* this is necessary to make it able to work with default array 
+                               * properties, returned to user */
+                               if (Z_TYPE_P(prop_copy) == IS_CONSTANT_ARRAY || Z_TYPE_P(prop_copy) == IS_CONSTANT) {
+                                       zval_update_constant(&prop_copy, 0 TSRMLS_CC);
+                               }
+                               
                                add_assoc_zval(return_value, prop_name, prop_copy);
                        }
                }