summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2001-07-11 11:45:05 +0000
committerStanislav Malyshev <stas@php.net>2001-07-11 11:45:05 +0000
commitadc98200d62a67dfa57ccb01d22b84945450429c (patch)
tree9996e7ec0ce53caefee65aabcbda3e52b16a9179
parent66d94bc655984d94416d4627e98825f23bc7c494 (diff)
downloadphp-git-adc98200d62a67dfa57ccb01d22b84945450429c.tar.gz
More correct pseudo-fix
# This is not really a fix. This thing is still broken. I will think on # how to really fix it. Any suggestion is *welcome*.
-rw-r--r--ext/standard/var.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/standard/var.c b/ext/standard/var.c
index 7611fb7b51..05b12e6aa1 100644
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -324,7 +324,7 @@ PHPAPI void php_var_serialize(zval *buf, zval **struc, HashTable *var_hash)
if ((i = zend_hash_get_current_key_ex(myht, &key, NULL, &index, 0, &pos)) == HASH_KEY_NON_EXISTANT) {
break;
}
- if (zend_hash_get_current_data_ex(myht, (void **) (&data), &pos) != SUCCESS || !data /* || ((*data) == (*struc)) */) {
+ if (zend_hash_get_current_data_ex(myht, (void **) (&data), &pos) != SUCCESS || !data || data == struc) {
continue;
}
@@ -342,7 +342,6 @@ PHPAPI void php_var_serialize(zval *buf, zval **struc, HashTable *var_hash)
FREE_ZVAL(d);
break;
}
- if (data == struc) return;
php_var_serialize(buf, data, var_hash);
}
}