From: Thies C. Arntzen <thies@php.net>
Date: Tue, 14 Mar 2000 07:49:42 +0000 (+0000)
Subject: @- fixed possible crash in unserialize if the serailized data was
X-Git-Tag: PHP-4.0-RC1~143
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49cc8a780515a785044f4a6d5a833c6f43e32806;p=php

@- fixed possible crash in unserialize if the serailized data was
@  damaged. (Thies)
---

diff --git a/ext/standard/var.c b/ext/standard/var.c
index a90be6d128..eb1245a2f9 100644
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -274,14 +274,14 @@ void php_var_serialize(pval *buf, pval **struc)
 
 					switch (i) {
 						case HASH_KEY_IS_LONG:
-							ALLOC_ZVAL(d);	
+							MAKE_STD_ZVAL(d);	
 							d->type = IS_LONG;
 							d->value.lval = index;
 							php_var_serialize(buf, &d);
 							FREE_ZVAL(d);
 							break;
 						case HASH_KEY_IS_STRING:
-							ALLOC_ZVAL(d);	
+							MAKE_STD_ZVAL(d);	
 							d->type = IS_STRING;
 							d->value.str.val = key;
 							d->value.str.len = strlen(key);
@@ -465,8 +465,9 @@ int php_var_unserialize(pval **rval, const char **p, const char *max)
 				pval *key;
 				pval *data;
 				
-				ALLOC_ZVAL(key);
-				ALLOC_ZVAL(data);
+				ALLOC_INIT_ZVAL(key);
+				ALLOC_INIT_ZVAL(data);
+
 				if (!php_var_unserialize(&key, p, max)) {
 				  	zval_dtor(key);
 				  	FREE_ZVAL(key);