com php-src: Fixed memory leak (double array_init): mai n/output.c

From: Date: Fri, 07 Mar 2014 09:48:54 +0000
Subject: com php-src: Fixed memory leak (double array_init): mai n/output.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-77689@lists.php.net to get a copy of this message
Commit: be6e417fdcc318b2e68e6ca7ede4ed0195c4015f Author: Xinchen Hui <laruence@gmail.com> Fri, 7 Mar 2014 17:48:54 +0800 Parents: 3da247e7a8a9b73f8f996c28c57fe139b629aaa8 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=be6e417fdcc318b2e68e6ca7ede4ed0195c4015f Log: Fixed memory leak (double array_init) Changed paths: M main/output.c Diff: diff --git a/main/output.c b/main/output.c index a25a326..f8b7775 100644 --- a/main/output.c +++ b/main/output.c @@ -1508,13 +1508,13 @@ PHP_FUNCTION(ob_get_status) return; } - array_init(return_value); - if (!OG(active)) { + array_init(return_value); return; } if (full_status) { + array_init(return_value); zend_stack_apply_with_argument(&OG(handlers), ZEND_STACK_APPLY_BOTTOMUP, php_output_stack_apply_status, return_value); } else { php_output_handler_status(OG(active), return_value);

« previous php.cvs (#77689) next »