CVS update: php4/ext/standard
| From: | andrey | Date: | Thu, 10 Jun 1999 15:13:27 +0000 |
| Subject: | CVS update: php4/ext/standard | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-1458@lists.php.net to get a copy of this message | ||
Date: Thursday June 10, 1999 @ 11:13
Author: andrey
Update of /repository/php4/ext/standard
In directory php:/tmp/cvs-serv14925/ext/standard
Modified Files:
var.c
Log Message:
Fixing serialize a bit.
Index: php4/ext/standard/var.c
diff -u php4/ext/standard/var.c:1.8 php4/ext/standard/var.c:1.9
--- php4/ext/standard/var.c:1.8 Fri May 28 17:41:17 1999
+++ php4/ext/standard/var.c Thu Jun 10 11:13:26 1999
@@ -205,7 +205,7 @@
STR_CAT(buf, s, slen);
if (i > 0) {
char *key;
- pval *data,*d;
+ pval **data,*d;
ulong index;
_php3_hash_internal_pointer_reset((*struc)->value.ht);
@@ -213,10 +213,8 @@
if ((i = _php3_hash_get_current_key((*struc)->value.ht, &key, &index)) ==
HASH_KEY_NON_EXISTANT) {
break;
}
- if (_php3_hash_get_current_data((*struc)->value.ht, (void **) (&data)) != SUCCESS ||
!data || (data == (*struc))) {
- continue;
- }
- if (data->type==IS_STRING && data->value.str.val==undefined_variable_string) {
+ if (_php3_hash_get_current_data((*struc)->value.ht, (void **) (&data)) !=
+ SUCCESS || !data || ((*data) == (*struc))) {
continue;
}