svf: fix leaking file descriptor

The file descriptor svf_fd is not closed on command error, thus
leaking memory.

Close svf_fd on errors.
While there, properly initialize svf_fd using NULL instead of 0.

Change-Id: I5efe9ce576a3a50588b30000222665e26161dfdc
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/7532
Tested-by: jenkins
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-by: <kai.schmitz@advantest.com>

diff --git a/src/svf/svf.c b/src/svf/svf.c
index 7195880670970a9bbce5a6dc86bc1779f14e4fc3..05fb21d631ee13837c4091afa940227a831bc9fd 100644 (file)
--- a/src/svf/svf.c
+++ b/src/svf/svf.c
@@ -377,6 +377,9 @@ COMMAND_HANDLER(handle_svf_command)
                        svf_addcycles = atoi(CMD_ARGV[i + 1]);
                        if (svf_addcycles > SVF_MAX_ADDCYCLES) {
                                command_print(CMD, "addcycles: %s out of range", CMD_ARGV[i + 1]);
+                               if (svf_fd)
+                                       fclose(svf_fd);
+                               svf_fd = NULL;
                                return ERROR_FAIL;
                        }
                        i++;
@@ -384,6 +387,9 @@ COMMAND_HANDLER(handle_svf_command)
                        tap = jtag_tap_by_string(CMD_ARGV[i+1]);
                        if (!tap) {
                                command_print(CMD, "Tap: %s unknown", CMD_ARGV[i+1]);
+                               if (svf_fd)
+                                       fclose(svf_fd);
+                               svf_fd = NULL;
                                return ERROR_FAIL;
                        }
                        i++;
@@ -546,7 +552,7 @@ COMMAND_HANDLER(handle_svf_command)
 free_all:
 
        fclose(svf_fd);
-       svf_fd = 0;
+       svf_fd = NULL;
 
        /* free buffers */
        free(svf_command_buffer);