From: Arnaud Le Blanc <lbarnaud@php.net>
Date: Mon, 18 Aug 2008 04:09:38 +0000 (+0000)
Subject: MFH: Fixed bug #45392 (ob_start()/ob_end_clean() and memory_limit).
X-Git-Tag: php-5.2.7RC1~101
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f44413558a9f78b083be36971fc11bb406f8586;p=php

MFH: Fixed bug #45392 (ob_start()/ob_end_clean() and memory_limit).
---

diff --git a/NEWS b/NEWS
index fa0095face..0e71605cdf 100644
--- a/NEWS
+++ b/NEWS
@@ -43,6 +43,7 @@ PHP                                                                        NEWS
   before shutdown) (basant dot kukreja at sun dot com)
 - Fixed bug #45406 (session.serialize_handler declared by shared extension 
   fails). (Kalle, oleg dot grenrus at dynamoid dot com)
+- Fixed bug #45392 (ob_start()/ob_end_clean() and memory_limit). (Arnaud)
 - Fixed bug #45352 (Segmentation fault because of tick function on second
   request). (Dmitry)
 - Fixed bug #45312 (Segmentation fault on second request for array functions).
diff --git a/main/output.c b/main/output.c
index 0b86131939..4b1aa37cb1 100644
--- a/main/output.c
+++ b/main/output.c
@@ -336,7 +336,13 @@ PHPAPI void php_end_ob_buffer(zend_bool send_buffer, zend_bool just_flush TSRMLS
 PHPAPI void php_end_ob_buffers(zend_bool send_buffer TSRMLS_DC)
 {
 	while (OG(ob_nesting_level)!=0) {
-		php_end_ob_buffer(send_buffer, 0 TSRMLS_CC);
+		/* in case of unclean_shutdown, do not output the buffer if it is not 
+		 * meant to be until end of script or ob_end_*() call */
+		if (CG(unclean_shutdown) && !OG(active_ob_buffer).chunk_size) {
+			php_end_ob_buffer(0, 0 TSRMLS_CC);
+		} else {
+			php_end_ob_buffer(send_buffer, 0 TSRMLS_CC);
+		}
 	}
 }
 /* }}} */
diff --git a/tests/lang/bug45392.phpt b/tests/lang/bug45392.phpt
new file mode 100644
index 0000000000..0962a9fe80
--- /dev/null
+++ b/tests/lang/bug45392.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Bug #45392 (ob_start()/ob_end_clean() and memory_limit)
+--INI--
+display_errors=stderr
+--FILE--
+<?php
+echo __LINE__ . "\n";
+ini_set('memory_limit', 100);
+ob_start(NULL, 10);
+echo __LINE__ ."\n";
+ob_start();
+$i = 0;
+while($i++ < 5000)  {
+  echo str_repeat("may not be displayed ", 42);
+}
+ob_end_flush();
+ob_end_clean();
+?>
+--EXPECTF--
+2
+Fatal error: Allowed memory size of %d bytes exhausted%s
+5