More correct pseudo-fix

smalyshev · smalyshev · commit adc98200d62a · 2001-07-11T11:45:05.000Z
# This is not really a fix. This thing is still broken. I will think on
# how to really fix it. Any suggestion is *welcome*.
diff --git 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);
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ PHPAPI void php_var_serialize(zval buf, zval struc, HashTable var_hash)`
`324`	`324`	`if ((i = zend_hash_get_current_key_ex(myht, &key, NULL, &index, 0, &pos)) == HASH_KEY_NON_EXISTANT) {`
`325`	`325`	`break;`
`326`	`326`	`}`
`327`		`- if (zend_hash_get_current_data_ex(myht, (void *) (&data), &pos) != SUCCESS \|\| !data / \|\| ((data) == (struc)) */) {`
	`327`	`+ if (zend_hash_get_current_data_ex(myht, (void **) (&data), &pos) != SUCCESS \|\| !data \|\| data == struc) {`
`328`	`328`	`continue;`
`329`	`329`	`}`
`330`	`330`
`@@ -342,7 +342,6 @@ PHPAPI void php_var_serialize(zval buf, zval struc, HashTable var_hash)`
`342`	`342`	`FREE_ZVAL(d);`
`343`	`343`	`break;`
`344`	`344`	`}`
`345`		`- if (data == struc) return;`
`346`	`345`	`php_var_serialize(buf, data, var_hash);`
`347`	`346`	`}`
`348`	`347`	`}`