cvs: php4 /main output.c

yohgaki Sat May 4 06:55:08 2002 EDT Modified files: /php4/main output.c Log: Forgot to dup strings. Index: php4/main/output.c diff -u php4/main/output.c:1.97 php4/main/output.c:1.98 --- php4/main/output.c:1.97 Sat May 4 05:46:44 2002 +++ php4/main/output.c Sat May 4 06:55:08 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: output.c,v 1.97 2002/05/04 09:46:44 yohgaki Exp $ */ +/* $Id: output.c,v 1.98 2002/05/04 10:55:08 yohgaki Exp $ */ #include "php.h" #include "ext/standard/head.h" @@ -268,8 +268,10 @@ zval_ptr_dtor(&alternate_buffer); } - if (!just_flush) { + if (status & PHP_OUTPUT_HANDLER_END) { efree(to_be_destoryed_handler_name); + } + if (!just_flush) { efree(to_be_destroyed_buffer); } else { OG(active_ob_buffer).text_length = 0; @@ -370,10 +372,10 @@ else if (output_handler && output_handler->type == IS_ARRAY) { /* FIXME: Array type is not supported yet. See call_user_function_ex() for detials. */ - OG(active_ob_buffer).handler_name = "array is not supported yet"; + OG(active_ob_buffer).handler_name = estrdup("array is not supported yet"); } else { - OG(active_ob_buffer).handler_name = "default output handler"; + OG(active_ob_buffer).handler_name = estrdup("default output handler"); } OG(active_ob_buffer).erase = erase; }