stas            Tue Nov 20 03:05:12 2007 UTC

  Modified files:              (Branch: PHP_4_4)
    /php-src/main       output.c 
  Log:
  fix crash with bad parameters
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/output.c?r1=1.142.2.16.2.6&r2=1.142.2.16.2.7&diff_format=u
Index: php-src/main/output.c
diff -u php-src/main/output.c:1.142.2.16.2.6 
php-src/main/output.c:1.142.2.16.2.7
--- php-src/main/output.c:1.142.2.16.2.6        Mon Feb 12 17:13:22 2007
+++ php-src/main/output.c       Tue Nov 20 03:05:12 2007
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: output.c,v 1.142.2.16.2.6 2007/02/12 17:13:22 tony2001 Exp $ */
+/* $Id: output.c,v 1.142.2.16.2.7 2007/11/20 03:05:12 stas Exp $ */
 
 #include "php.h"
 #include "ext/standard/head.h"
@@ -432,10 +432,10 @@
                }
                zend_stack_push(&OG(ob_buffers), &OG(active_ob_buffer), 
sizeof(php_ob_buffer));
        }
+       OG(active_ob_buffer).buffer = (char *) emalloc(initial_size+1);
        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;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to