MFB51: Fixed memory leak on php-cli -h

php · Nov 15, 2005 · 4ded445 · 4ded445
1 parent 8bb39e7
commit 4ded445
Showing 1 changed file with 4 additions and 5 deletions.
diff --git 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) {