MFH serializer fix

diff --git a/ext/standard/var.c b/ext/standard/var.c
index 2cda9678dcc3ef142e42fde95baa1dc400290503..1eefc30bf8001389e1c42063ac034d529f389e02 100644 (file)
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -389,10 +389,12 @@ static inline void php_var_serialize_class_name(smart_str *buf, zval **struc TSR
 
 static void php_var_serialize_class(smart_str *buf, zval **struc, zval *retval_ptr, HashTable *var_hash TSRMLS_DC)
 {
-       int count = zend_hash_num_elements(HASH_OF(retval_ptr));
+       int count;
 
        php_var_serialize_class_name(buf, struc TSRMLS_CC);
-
+       /* count after serializing name, since php_var_serialize_class_name
+          changes the count if the variable is incomplete class */
+       count = zend_hash_num_elements(HASH_OF(retval_ptr));
        smart_str_append_long(buf, count);
        smart_str_appendl(buf, ":{", 2);