cvs: /php4/ext/standard var.c
| From: | Thies C. Arntzen | Date: | Tue, 14 Mar 2000 07:50:13 +0000 |
| Subject: | cvs: /php4/ext/standard var.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-12084@lists.php.net to get a copy of this message | ||
thies Mon Mar 13 23:50:13 2000 EDT
Modified files:
/php4/ext/standard var.c
Log:
@- fixed possible crash in unserialize if the serailized data was
@ damaged. (Thies)
Index: php4/ext/standard/var.c
diff -u php4/ext/standard/var.c:1.48 php4/ext/standard/var.c:1.49
--- php4/ext/standard/var.c:1.48 Sat Feb 19 15:41:21 2000
+++ php4/ext/standard/var.c Mon Mar 13 23:49:42 2000
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var.c,v 1.48 2000/02/19 23:41:21 zeev Exp $ */
+/* $Id: var.c,v 1.49 2000/03/14 07:49:42 thies Exp $ */
/* {{{ includes
@@ -274,14 +274,14 @@
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 @@
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);