cvs: php4(PHP_4_3) /main output.c
| From: | Wez Furlong | Date: | Sat, 17 May 2003 09:34:12 +0000 |
| Subject: | cvs: php4(PHP_4_3) /main output.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-20987@lists.php.net to get a copy of this message | ||
wez Sat May 17 05:34:12 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/main output.c
Log:
Fix segfault
Index: php4/main/output.c
diff -u php4/main/output.c:1.142.2.11 php4/main/output.c:1.142.2.12
--- php4/main/output.c:1.142.2.11 Fri May 16 15:06:37 2003
+++ php4/main/output.c Sat May 17 05:34:12 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: output.c,v 1.142.2.11 2003/05/16 19:06:37 wez Exp $ */
+/* $Id: output.c,v 1.142.2.12 2003/05/17 09:34:12 wez Exp $ */
#include "php.h"
#include "ext/standard/head.h"
@@ -408,7 +408,7 @@
*/
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)
{
- if (!zend_is_callable(output_handler, 0, NULL)) {
+ if (output_handler && !zend_is_callable(output_handler, 0, NULL)) {
return FAILURE;
}
if (OG(ob_nesting_level)>0) {