cvs: php4(PHP_4_2_0) /ext/standard var.c
| From: | Stanislav Malyshev | Date: | Mon, 29 Apr 2002 15:45:58 +0000 |
| Subject: | cvs: php4(PHP_4_2_0) /ext/standard var.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-11531@lists.php.net to get a copy of this message | ||
stas Mon Apr 29 11:45:58 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4/ext/standard var.c
Log:
MFH serializer fix
Index: php4/ext/standard/var.c
diff -u php4/ext/standard/var.c:1.131.2.1 php4/ext/standard/var.c:1.131.2.2
--- php4/ext/standard/var.c:1.131.2.1 Sun Apr 28 13:02:10 2002
+++ php4/ext/standard/var.c Mon Apr 29 11:45:58 2002
@@ -389,10 +389,12 @@
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);