Fixed bug #40259 (ob_start call many times - memory error). (Dmitry)

diff --git a/NEWS b/NEWS
index ad9614e32c6e1fb132462ae8b1df82d364578a09..dacf8f73c059a566ebe4267da5b17cb485a00276 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2007, PHP 5.2.1
+- Fixed bug #40259 (ob_start call many times - memory error). (Dmitry)
 - Fixed bug #40231 (file_exists incorrectly reports false). (Dmitry)
 
 25 Jan 2007, PHP 5.2.1RC4

diff --git a/main/output.c b/main/output.c
index 2fd8247a0ec1a3ed00f72fa1acbd63912c18669d..ee4057bf74062c33463899a36e0017d64cfec532 100644 (file)
--- a/main/output.c
+++ b/main/output.c
@@ -416,9 +416,23 @@ PHPAPI int php_ob_init_conflict(char *handler_new, char *handler_set TSRMLS_DC)
  */
 static int php_ob_init_named(uint initial_size, uint block_size, char *handler_name, zval *output_handler, uint chunk_size, zend_bool erase TSRMLS_DC)
 {
+       php_ob_buffer tmp_buf;
+
        if (output_handler && !zend_is_callable(output_handler, 0, NULL)) {
                return FAILURE;
        }
+       
+       tmp_buf.block_size = block_size;
+       tmp_buf.size = initial_size;
+       tmp_buf.buffer = (char *) emalloc(initial_size+1);
+       tmp_buf.text_length = 0;
+       tmp_buf.output_handler = output_handler;
+       tmp_buf.chunk_size = chunk_size;
+       tmp_buf.status = 0;
+       tmp_buf.internal_output_handler = NULL;
+       tmp_buf.handler_name = estrdup(handler_name&&handler_name[0]?handler_name:OB_DEFAULT_HANDLER_NAME);
+       tmp_buf.erase = erase;
+
        if (OG(ob_nesting_level)>0) {
 #if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
                if (!strncmp(handler_name, "ob_gzhandler", sizeof("ob_gzhandler")) && php_ob_gzhandler_check(TSRMLS_C)) {
@@ -431,16 +445,7 @@ static int php_ob_init_named(uint initial_size, uint block_size, char *handler_n
                zend_stack_push(&OG(ob_buffers), &OG(active_ob_buffer), sizeof(php_ob_buffer));
        }
        OG(ob_nesting_level)++;
-       OG(active_ob_buffer).block_size = block_size;
-       OG(active_ob_buffer).size = initial_size;
-       OG(active_ob_buffer).buffer = (char *) emalloc(initial_size+1);
-       OG(active_ob_buffer).text_length = 0;
-       OG(active_ob_buffer).output_handler = output_handler;
-       OG(active_ob_buffer).chunk_size = chunk_size;
-       OG(active_ob_buffer).status = 0;
-       OG(active_ob_buffer).internal_output_handler = NULL;
-       OG(active_ob_buffer).handler_name = estrdup(handler_name&&handler_name[0]?handler_name:OB_DEFAULT_HANDLER_NAME);
-       OG(active_ob_buffer).erase = erase;
+       OG(active_ob_buffer) = tmp_buf;
        OG(php_body_write) = php_b_body_write;
        return SUCCESS;
 }