From: Xinchen Hui <laruence@gmail.com>
Date: Fri, 7 Mar 2014 09:48:54 +0000 (+0800)
Subject: Fixed memory leak (double array_init)
X-Git-Tag: POST_PHPNG_MERGE~412^2~370
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=be6e417fdcc318b2e68e6ca7ede4ed0195c4015f;p=php

Fixed memory leak (double array_init)
---

diff --git a/main/output.c b/main/output.c
index a25a326e16..f8b777545d 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);