From: Ilia Alshanetsky <iliaa@php.net>
Date: Tue, 15 Nov 2005 15:30:41 +0000 (+0000)
Subject: MFB51: Fixed memory leak on php-cli -h
X-Git-Tag: RELEASE_2_0_1~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ded4455ebddb8ea18ee90f755bb1b2de30c0269;p=php

MFB51: Fixed memory leak on php-cli -h
---

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 7f971345ea..29f287bacc 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -700,14 +700,13 @@ int main(int argc, char *argv[])
 
 			case 'h': /* help & quit */
 			case '?':
-				php_output_startup();
-				php_output_activate(TSRMLS_C);
+				if (php_request_startup(TSRMLS_C)==FAILURE) {
+					goto err;
+				}
 				php_cli_usage(argv[0]);
 				php_end_ob_buffers(1 TSRMLS_CC);
 				exit_status=0;
-				zend_ini_deactivate(TSRMLS_C);
-				goto out_err;
-
+				goto out;
 
 			case 'i': /* php info & quit */
 				if (php_request_startup(TSRMLS_C)==FAILURE) {