drivers/ftdi: free allocated memory

[openocd.git] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index 831bd17f2a64282b99c9920f00af8a9e44cc680f..54fc83a1729659c7d0785af0e59ca4d66f19bc6e 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -286,10 +286,13 @@ static int openocd_thread(int argc, char *argv[], struct command_context *cmd_ct
                return ERROR_FAIL;
 
        ret = parse_config_file(cmd_ctx);
-       if (ret == ERROR_COMMAND_CLOSE_CONNECTION)
+       if (ret == ERROR_COMMAND_CLOSE_CONNECTION) {
+               server_quit(); /* gdb server may be initialized by -c init */
                return ERROR_OK;
-       else if (ret != ERROR_OK)
+       } else if (ret != ERROR_OK) {
+               server_quit(); /* gdb server may be initialized by -c init */
                return ERROR_FAIL;
+       }
 
        ret = server_init(cmd_ctx);
        if (ERROR_OK != ret)
@@ -342,6 +345,9 @@ int openocd_main(int argc, char *argv[])
        /* Start the executable meat that can evolve into thread in future. */
        ret = openocd_thread(argc, argv, cmd_ctx);
 
+       gdb_service_free();
+       server_free();
+
        unregister_all_commands(cmd_ctx, NULL);
 
        /* Shutdown commandline interface */
@@ -349,6 +355,8 @@ int openocd_main(int argc, char *argv[])
 
        adapter_quit();
 
+       free_config();
+
        if (ERROR_FAIL == ret)
                return EXIT_FAILURE;
        else if (ERROR_OK != ret)