[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-608-gb49e03f77

[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  b49e03f77ed890b39274d94ae6267bf07a68ba98 (commit)
      from  400cf213c05d17cede4dca4787a5533959bd2183 (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 b49e03f77ed890b39274d94ae6267bf07a68ba98
Author: Antonio Borneo <bor...@gm...>
Date:   Sun May 26 12:38:43 2024 +0200

    target/arm_tpiu_swo: Fix memory leak on error
    
    In case of fail to allocate 'obj->name', the memory allocated for
    'obj->out_filename' is not freed, thus leaking.
    
    Since 'obj' is allocated with calloc(), thus zeroed, switch to use
    the common error exit path for both allocations of 'obj->name' and
    'obj->out_filename'.
    
    Fixes: 2506ccb50915 ("target/arm_tpiu_swo: Fix division by zero")
    Change-Id: I412f66ddd7bf7d260cee495324058482b26ff0c5
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8300
    Tested-by: jenkins
    Reviewed-by: zapb <de...@za...>

diff --git a/src/target/arm_tpiu_swo.c b/src/target/arm_tpiu_swo.c
index b5a488201..55a977844 100644
--- a/src/target/arm_tpiu_swo.c
+++ b/src/target/arm_tpiu_swo.c
@@ -965,8 +965,7 @@ static int jim_arm_tpiu_swo_create(Jim_Interp *interp, int argc, Jim_Obj *const
 	obj->out_filename = strdup("external");
 	if (!obj->out_filename) {
 		LOG_ERROR("Out of memory");
-		free(obj);
-		return JIM_ERR;
+		goto err_exit;
 	}
 
 	Jim_Obj *n;
@@ -974,8 +973,7 @@ static int jim_arm_tpiu_swo_create(Jim_Interp *interp, int argc, Jim_Obj *const
 	obj->name = strdup(Jim_GetString(n, NULL));
 	if (!obj->name) {
 		LOG_ERROR("Out of memory");
-		free(obj);
-		return JIM_ERR;
+		goto err_exit;
 	}
 
 	/* Do the rest as "configure" options */

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

Summary of changes:
 src/target/arm_tpiu_swo.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository