Permalink
Browse files

- fix bug #61541, Segfault when using ob_* in output_callback

  • Loading branch information...
1 parent 4fa0c2a commit 9bc91a21db733b5e12ab6a4356b2470b72d784d5 @reeze reeze committed Mar 28, 2012
Showing with 11 additions and 2 deletions.
  1. +11 −0 main/output.c
  2. +0 −2 tests/output/ob_011.phpt
View
@@ -225,6 +225,17 @@ PHPAPI void php_end_ob_buffer(zend_bool send_buffer, zend_bool just_flush TSRMLS
zval *orig_buffer;
zval *z_status;
+ if(OG(ob_lock)) {
+ if (SG(headers_sent) && !SG(request_info).headers_only) {
+ OG(php_body_write) = php_ub_body_write_no_header;
+ } else {
+ OG(php_body_write) = php_ub_body_write;
+ }
+ OG(ob_nesting_level) = 0;
+ php_error_docref("ref.outcontrol" TSRMLS_CC, E_ERROR, "Cannot use output buffering in output buffering display handlers");
+ return;
+ }
+
ALLOC_INIT_ZVAL(orig_buffer);
ZVAL_STRINGL(orig_buffer, OG(active_ob_buffer).buffer, OG(active_ob_buffer).text_length, 1);
View
@@ -1,7 +1,5 @@
--TEST--
output buffering - fatalism
---XFAIL--
-This test will fail until the fix in revision r214155 is backported from php 6
--FILE--
<?php
function obh($s)

0 comments on commit 9bc91a2

Please sign in to comment.