From 39aa0c4d3a4ca7268c9976a56346de2771119d16 Mon Sep 17 00:00:00 2001 From: Andrei Zmievski Date: Fri, 16 Jun 2000 19:55:51 +0000 Subject: [PATCH] Just to make extra sure. --- ext/standard/var.c | 4 ++-- ext/wddx/wddx.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ext/standard/var.c b/ext/standard/var.c index a85a5f37ae..ed65ce4bbe 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -199,7 +199,7 @@ void php_var_serialize(pval *buf, pval **struc) return; case IS_OBJECT: { - zval *retval_ptr; + zval *retval_ptr = NULL; zval *fname; int res; CLS_FETCH(); @@ -510,7 +510,7 @@ int php_var_unserialize(pval **rval, const char **p, const char *max) } if ((*rval)->type == IS_OBJECT) { - zval *retval_ptr; + zval *retval_ptr = NULL; zval *fname; CLS_FETCH(); diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c index 3a1b3f6339..3f8d716c05 100644 --- a/ext/wddx/wddx.c +++ b/ext/wddx/wddx.c @@ -382,7 +382,8 @@ static void php_wddx_serialize_unset(wddx_packet *packet) 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 @@ static void php_wddx_pop_element(void *user_data, const char *name) 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) { -- 2.50.1