cvs: php4 /ext/session session.c

sas Sun Jan 7 02:42:16 2001 EDT Modified files: /php4/ext/session session.c Log: Use MAKE_STD_ZVAL/FREE_ZVAL to handle zval memory allocation. Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.191 php4/ext/session/session.c:1.192 --- php4/ext/session/session.c:1.191 Sun Jan 7 02:32:06 2001 +++ php4/ext/session/session.c Sun Jan 7 02:42:15 2001 @@ -306,7 +306,7 @@ PHP_VAR_UNSERIALIZE_INIT(var_hash); - current = (zval *) ecalloc(sizeof(zval), 1); + MAKE_STD_ZVAL(current); for (p = val; p < endptr; ) { namelen = *p & (~PS_BIN_UNDEF); has_value = *p & PS_BIN_UNDEF ? 0 : 1; @@ -324,7 +324,7 @@ PS_ADD_VARL(name, namelen); efree(name); } - efree(current); + FREE_ZVAL(current); PHP_VAR_UNSERIALIZE_DESTROY(var_hash); return SUCCESS; @@ -386,7 +386,7 @@ PHP_VAR_UNSERIALIZE_INIT(var_hash); - current = (zval *) ecalloc(sizeof(zval), 1); + MAKE_STD_ZVAL(current); for (p = q = val; (p < endptr) && (q = memchr(p, PS_DELIMITER, endptr - p)); p = q) { if (p[0] == PS_UNDEF_MARKER) { p++; @@ -408,7 +408,7 @@ PS_ADD_VARL(name, namelen); efree(name); } - efree(current); + FREE_ZVAL(current); PHP_VAR_UNSERIALIZE_DESTROY(var_hash); return SUCCESS;