com php-src: Fixed asseration failed in ob_get_status: main/output.c
| From: | Dmitry Stogov | Date: | Fri, 07 Mar 2014 07:12:52 +0000 |
| Subject: | com php-src: Fixed asseration failed in ob_get_status: main/output.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77693@lists.php.net to get a copy of this message | ||
Commit: 7c623c0e89e2e5798bc40e3cb48e4151f2eab1ca
Author: Xinchen Hui <laruence@gmail.com> Fri, 7 Mar 2014 15:12:33 +0800
Parents: 7003e765126855737f3527142a82d9b9ce34e11a
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7c623c0e89e2e5798bc40e3cb48e4151f2eab1ca
Log:
Fixed asseration failed in ob_get_status
Changed paths:
M main/output.c
Diff:
diff --git a/main/output.c b/main/output.c
index 6504954..e9a816d 100644
--- a/main/output.c
+++ b/main/output.c
@@ -1170,9 +1170,9 @@ static int php_output_stack_apply_list(void *h, void *z)
static int php_output_stack_apply_status(void *h, void *z)
{
php_output_handler *handler = *(php_output_handler **) h;
- zval *array = (zval *) z;
+ zval arr, *array = (zval *) z;
- add_next_index_zval(array, php_output_handler_status(handler, NULL));
+ add_next_index_zval(array, php_output_handler_status(handler, &arr));
return 0;
}