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

andrei Sat Jun 17 08:53:33 2000 EDT Modified files: /php4/ext/standard var.c /php4/ext/wddx wddx.c Log: Have to use zval_ptr_dtor() on values returned from user functions. Index: php4/ext/standard/var.c diff -u php4/ext/standard/var.c:1.62 php4/ext/standard/var.c:1.63 --- php4/ext/standard/var.c:1.62 Fri Jun 16 12:55:51 2000 +++ php4/ext/standard/var.c Sat Jun 17 08:53:32 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.62 2000/06/16 19:55:51 andrei Exp $ */ +/* $Id: var.c,v 1.63 2000/06/17 15:53:32 andrei Exp $ */ /* {{{ includes @@ -255,10 +255,8 @@ zval_dtor(fname); FREE_ZVAL(fname); - if (retval_ptr) { - zval_dtor(retval_ptr); - FREE_ZVAL(retval_ptr); - } + if (retval_ptr) + zval_ptr_dtor(&retval_ptr); return; } @@ -521,10 +519,8 @@ zval_dtor(fname); FREE_ZVAL(fname); - if (retval_ptr) { - zval_dtor(retval_ptr); - FREE_ZVAL(retval_ptr); - } + if (retval_ptr) + zval_ptr_dtor(&retval_ptr); } return *((*p)++) == '}'; Index: php4/ext/wddx/wddx.c diff -u php4/ext/wddx/wddx.c:1.42 php4/ext/wddx/wddx.c:1.43 --- php4/ext/wddx/wddx.c:1.42 Sat Jun 17 07:48:03 2000 +++ php4/ext/wddx/wddx.c Sat Jun 17 08:53:33 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: wddx.c,v 1.42 2000/06/17 14:48:03 andi Exp $ */ +/* $Id: wddx.c,v 1.43 2000/06/17 15:53:33 andrei Exp $ */ #include "php.h" #include "php_wddx.h" @@ -449,10 +449,8 @@ zval_dtor(fname); FREE_ZVAL(fname); - if (retval) { - zval_dtor(retval); - FREE_ZVAL(retval); - } + if (retval) + zval_ptr_dtor(&retval); } static void php_wddx_serialize_array(wddx_packet *packet, zval *arr) @@ -756,10 +754,8 @@ zval_dtor(fname); FREE_ZVAL(fname); - if (retval) { - zval_dtor(retval); - FREE_ZVAL(retval); - } + if (retval) + zval_ptr_dtor(&retval); } else zend_hash_update(target_hash,