cvs: php4 /ext/standard filters.c

moriyoshi Tue Jan 7 17:53:42 2003 EDT Modified files: /php4/ext/standard filters.c Log: Instances should not be freed in dtor()... Index: php4/ext/standard/filters.c diff -u php4/ext/standard/filters.c:1.7 php4/ext/standard/filters.c:1.8 --- php4/ext/standard/filters.c:1.7 Tue Jan 7 17:52:24 2003 +++ php4/ext/standard/filters.c Tue Jan 7 17:53:42 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filters.c,v 1.7 2003/01/07 22:52:24 moriyoshi Exp $ */ +/* $Id: filters.c,v 1.8 2003/01/07 22:53:42 moriyoshi Exp $ */ #include "php.h" #include "php_globals.h" @@ -265,8 +265,7 @@ static void php_base64_filter_dtor(php_base64_filter *inst) { - assert(inst != NULL); - efree(inst); + /* do nothing */ } static size_t strfilter_base64_write(php_stream *stream, php_stream_filter *thisfilter, @@ -448,6 +447,9 @@ static void strfilter_base64_dtor(php_stream_filter *thisfilter TSRMLS_DC) { php_base64_filter_dtor((php_base64_filter *)thisfilter->abstract); + + assert(thisfilter->abstract != NULL); + efree(thisfilter->abstract); } static php_stream_filter_ops strfilter_base64_ops = {