php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 03:03:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Just to make extra sure.

Browse Source
This commit is contained in:
Andrei Zmievski
2000-06-16 19:55:51 +00:00
parent f14961b005
commit 39aa0c4d3a
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/standard/var.c
+2 -2
View File
@@ -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();
ext/wddx/wddx.c
+3 -2
View File
@@ -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) {