From: Antony Dovgal Date: Thu, 28 Apr 2005 14:20:28 +0000 (+0000) Subject: fix #32828 (Throwing exception in output_callback function with ob_start and X-Git-Tag: php-5.0.1b1~386 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b0d523660552100761dd0fbe78eb60edf50f6aff;p=php fix #32828 (Throwing exception in output_callback function with ob_start and ob_end_clean leads to segfault) --- diff --git a/main/output.c b/main/output.c index 14303fd9f6..3214d00a7c 100644 --- a/main/output.c +++ b/main/output.c @@ -238,7 +238,7 @@ PHPAPI void php_end_ob_buffer(zend_bool send_buffer, zend_bool just_flush TSRMLS OG(ob_lock) = 1; if (call_user_function_ex(CG(function_table), NULL, OG(active_ob_buffer).output_handler, &alternate_buffer, 2, params, 1, NULL TSRMLS_CC)==SUCCESS) { - if (!(Z_TYPE_P(alternate_buffer)==IS_BOOL && Z_BVAL_P(alternate_buffer)==0)) { + if (alternate_buffer && !(Z_TYPE_P(alternate_buffer)==IS_BOOL && Z_BVAL_P(alternate_buffer)==0)) { convert_to_string_ex(&alternate_buffer); final_buffer = Z_STRVAL_P(alternate_buffer); final_buffer_length = Z_STRLEN_P(alternate_buffer);