cvs: php4 /main output.c

yohgaki Wed May 8 07:44:18 2002 EDT Modified files: /php4/main output.c Log: Added estrdup() needed. Fixed typo. Index: php4/main/output.c diff -u php4/main/output.c:1.101 php4/main/output.c:1.102 --- php4/main/output.c:1.101 Sat May 4 19:23:16 2002 +++ php4/main/output.c Wed May 8 07:44:14 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: output.c,v 1.101 2002/05/04 23:23:16 zeev Exp $ */ +/* $Id: output.c,v 1.102 2002/05/08 11:44:14 yohgaki Exp $ */ #include "php.h" #include "ext/standard/head.h" @@ -134,7 +134,7 @@ char *final_buffer=NULL; unsigned int final_buffer_length=0; zval *alternate_buffer=NULL; - char *to_be_destroyed_buffer, *to_be_destoryed_handler_name; + char *to_be_destroyed_buffer, *to_be_destroyed_handler_name; char *to_be_destroyed_handled_output[2] = { 0, 0 }; int status; php_ob_buffer *prev_ob_buffer_p=NULL; @@ -213,7 +213,7 @@ } to_be_destroyed_buffer = OG(active_ob_buffer).buffer; - to_be_destoryed_handler_name = OG(active_ob_buffer).handler_name; + to_be_destroyed_handler_name = OG(active_ob_buffer).handler_name; if (OG(active_ob_buffer).internal_output_handler && (final_buffer != OG(active_ob_buffer).internal_output_handler_buffer) && (final_buffer != OG(active_ob_buffer).buffer)) { @@ -253,7 +253,7 @@ } if (status & PHP_OUTPUT_HANDLER_END) { - efree(to_be_destoryed_handler_name); + efree(to_be_destroyed_handler_name); } if (!just_flush) { efree(to_be_destroyed_buffer); @@ -308,9 +308,9 @@ OG(active_ob_buffer).internal_output_handler = internal_output_handler; OG(active_ob_buffer).internal_output_handler_buffer = (char *) emalloc(buffer_size); OG(active_ob_buffer).internal_output_handler_buffer_size = buffer_size; - if (OG(active_ob_buffer).handler_name) + if (OG(active_ob_buffer).handler_name) efree(OG(active_ob_buffer).handler_name); - OG(active_ob_buffer).handler_name = handler_name; + OG(active_ob_buffer).handler_name = estrdup(handler_name); OG(active_ob_buffer).erase = erase; } /* }}} */