[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-100-g86827a961

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  86827a961a22815ebd5fa367468ca7444f0ee2e1 (commit)
      from  415715d91a11ea4ed6db3a1fd760741a22b6e098 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 86827a961a22815ebd5fa367468ca7444f0ee2e1
Author: Antonio Borneo <bor...@gm...>
Date:   Fri Mar 10 11:50:08 2023 +0100

    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 <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7532
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>
    Reviewed-by: <kai...@ad...>

diff --git a/src/svf/svf.c b/src/svf/svf.c
index 719588067..05fb21d63 100644
--- 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);

-----------------------------------------------------------------------

Summary of changes:
 src/svf/svf.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository