]> granicus.if.org Git - php/commitdiff
Fixed memory leak (double array_init)
authorXinchen Hui <laruence@gmail.com>
Fri, 7 Mar 2014 09:48:54 +0000 (17:48 +0800)
committerXinchen Hui <laruence@gmail.com>
Fri, 7 Mar 2014 09:48:54 +0000 (17:48 +0800)
main/output.c

index a25a326e166804d5296410c225f91a289f53133b..f8b777545d619799d278b89f435cfe8212c37934 100644 (file)
@@ -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);