cvs: php4 /ext/standard var.c /ext/wddx wddx.c

andrei Fri Jun 16 12:55:51 2000 EDT Modified files: /php4/ext/standard var.c /php4/ext/wddx wddx.c Log: Just to make extra sure. Index: php4/ext/standard/var.c diff -u php4/ext/standard/var.c:1.61 php4/ext/standard/var.c:1.62 --- php4/ext/standard/var.c:1.61 Fri Jun 16 12:53:06 2000 +++ php4/ext/standard/var.c Fri Jun 16 12:55:51 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.61 2000/06/16 19:53:06 andrei Exp $ */ +/* $Id: var.c,v 1.62 2000/06/16 19:55:51 andrei Exp $ */ /* {{{ includes @@ -199,7 +199,7 @@ return; case IS_OBJECT: { - zval *retval_ptr; + zval *retval_ptr = NULL; zval *fname; int res; CLS_FETCH(); @@ -510,7 +510,7 @@ } if ((*rval)->type == IS_OBJECT) { - zval *retval_ptr; + zval *retval_ptr = NULL; zval *fname; CLS_FETCH(); Index: php4/ext/wddx/wddx.c diff -u php4/ext/wddx/wddx.c:1.40 php4/ext/wddx/wddx.c:1.41 --- php4/ext/wddx/wddx.c:1.40 Fri Jun 16 12:50:45 2000 +++ php4/ext/wddx/wddx.c Fri Jun 16 12:55:51 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: wddx.c,v 1.40 2000/06/16 19:50:45 andrei Exp $ */ +/* $Id: wddx.c,v 1.41 2000/06/16 19:55:51 andrei Exp $ */ #include "php.h" #include "php_wddx.h" @@ -382,7 +382,8 @@ static void php_wddx_serialize_object(wddx_packet *packet, zval *obj) { - zval **ent, *retval, *fname, **varname; + zval **ent, *fname, **varname; + zval *retval = NULL; char *key; ulong idx; char tmp_buf[WDDX_BUF_LEN]; @@ -715,7 +716,7 @@ if (ent1->varname) { if (!strcmp(ent1->varname, PHP_CLASS_NAME_VAR) && ent1->data->type == IS_STRING && ent1->data->value.str.len) { - zval *fname, *retval; + zval *fname, *retval = NULL; if (zend_hash_find(EG(class_table), ent1->data->value.str.val, ent1->data->value.str.len+1, (void **) &ce)==FAILURE) {