cvs: php4 /main output.c
| From: | Zeev Suraski | Date: | Fri, 31 Aug 2001 15:16:15 +0000 |
| Subject: | cvs: php4 /main output.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-7134@lists.php.net to get a copy of this message | ||
zeev Fri Aug 31 11:16:15 2001 EDT
Modified files:
/php4/main output.c
Log:
Fix double freeing
Index: php4/main/output.c
diff -u php4/main/output.c:1.75 php4/main/output.c:1.76
--- php4/main/output.c:1.75 Sat Aug 25 11:57:42 2001
+++ php4/main/output.c Fri Aug 31 11:16:15 2001
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: output.c,v 1.75 2001/08/25 15:57:42 zeev Exp $ */
+/* $Id: output.c,v 1.76 2001/08/31 15:16:15 zeev Exp $ */
#include "php.h"
#include "ext/standard/head.h"
@@ -200,7 +200,8 @@
to_be_destroyed_buffer = OG(active_ob_buffer).buffer;
if (OG(active_ob_buffer).internal_output_handler
- && (final_buffer != OG(active_ob_buffer).internal_output_handler_buffer)) {
+ && (final_buffer != OG(active_ob_buffer).internal_output_handler_buffer)
+ && (final_buffer != OG(active_ob_buffer).buffer)) {
to_be_destroyed_handled_output[0] = final_buffer;
}