iliaa           Sat Oct 26 15:33:15 2002 EDT

  Modified files:              
    /php4/sapi/cli      php_cli.c 
  Log:
  Fixed memory leaks.
  
  
Index: php4/sapi/cli/php_cli.c
diff -u php4/sapi/cli/php_cli.c:1.44 php4/sapi/cli/php_cli.c:1.45
--- php4/sapi/cli/php_cli.c:1.44        Fri Oct 25 05:32:32 2002
+++ php4/sapi/cli/php_cli.c     Sat Oct 26 15:33:15 2002
@@ -740,8 +740,6 @@
                        break;
                }
 
-               php_request_shutdown((void *) 0);
-
                if (cli_sapi_module.php_ini_path_override) {
                        free(cli_sapi_module.php_ini_path_override);
                }
@@ -751,6 +749,8 @@
        } zend_end_try();
 
 out:
+       php_request_shutdown((void *) 0);
+out_err:       
        if (module_started) {
                php_module_shutdown(TSRMLS_C);
        }
@@ -762,8 +762,9 @@
        exit(exit_status);
 
 err:
+       zend_ini_deactivate(TSRMLS_C);
        exit_status = 1;
-       goto out;
+       goto out_err;
 }
 /* }}} */
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to