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

sas Fri Aug 3 07:00:17 2001 EDT Modified files: /php4/ext/session session.c /php4/ext/standard var.c Log: Do the nul'ifiying of php_var_serialize's result at the right place Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.227 php4/ext/session/session.c:1.228 --- php4/ext/session/session.c:1.227 Fri Aug 3 06:39:48 2001 +++ php4/ext/session/session.c Fri Aug 3 07:00:16 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.227 2001/08/03 10:39:48 sas Exp $ */ +/* $Id: session.c,v 1.228 2001/08/03 11:00:16 sas Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -297,8 +297,6 @@ smart_str_appendl(&buf, key, key_length); ); - smart_str_0(&buf); - if (newlen) *newlen = buf.len; *newstr = buf.c; PHP_VAR_SERIALIZE_DESTROY(var_hash); @@ -366,8 +364,6 @@ smart_str_appendc(&buf, PS_DELIMITER); ); - smart_str_0(&buf); - if (newlen) *newlen = buf.len; *newstr = buf.c; Index: php4/ext/standard/var.c diff -u php4/ext/standard/var.c:1.103 php4/ext/standard/var.c:1.104 --- php4/ext/standard/var.c:1.103 Fri Aug 3 05:35:33 2001 +++ php4/ext/standard/var.c Fri Aug 3 07:00:16 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.103 2001/08/03 09:35:33 sas Exp $ */ +/* $Id: var.c,v 1.104 2001/08/03 11:00:16 sas Exp $ */ /* {{{ includes @@ -163,7 +163,7 @@ return SUCCESS; } -PHPAPI void php_var_serialize(smart_str *buf, zval **struc, HashTable *var_hash) +static void php_var_serialize_intern(smart_str *buf, zval **struc, HashTable *var_hash) { char s[256]; ulong slen; @@ -254,8 +254,8 @@ } if (zend_hash_find(Z_OBJPROP_PP(struc), Z_STRVAL_PP(name), Z_STRLEN_PP(name)+1, (void*)&d) == SUCCESS) { - php_var_serialize(buf, name, NULL); - php_var_serialize(buf, d, var_hash); + php_var_serialize_intern(buf, name, NULL); + php_var_serialize_intern(buf, d, var_hash); } } } @@ -317,17 +317,17 @@ case HASH_KEY_IS_LONG: MAKE_STD_ZVAL(d); ZVAL_LONG(d,index); - php_var_serialize(buf, &d, NULL); + php_var_serialize_intern(buf, &d, NULL); FREE_ZVAL(d); break; case HASH_KEY_IS_STRING: MAKE_STD_ZVAL(d); ZVAL_STRING(d,key,0); - php_var_serialize(buf, &d, NULL); + php_var_serialize_intern(buf, &d, NULL); FREE_ZVAL(d); break; } - php_var_serialize(buf, data, var_hash); + php_var_serialize_intern(buf, data, var_hash); } } smart_str_appendc(buf, '}'); @@ -338,6 +338,12 @@ } } +PHPAPI void php_var_serialize(smart_str *buf, zval **struc, HashTable *var_hash) +{ + php_var_serialize_intern(buf, struc, var_hash); + smart_str_0(buf); +} + /* }}} */ /* {{{ php_var_dump */ @@ -606,7 +612,6 @@ PHP_VAR_SERIALIZE_INIT(var_hash); php_var_serialize(&buf, struc, &var_hash); PHP_VAR_SERIALIZE_DESTROY(var_hash); - smart_str_0(&buf); RETVAL_STRINGL(buf.c, buf.len, 0); }