[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.10.0-1296-g70f69f872

[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  70f69f872857fd94ed252088d00e071e57d07b39 (commit)
      from  ef14384b681af4f731f768bb866457832af6925f (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 70f69f872857fd94ed252088d00e071e57d07b39
Author: Mikhail Rasputin <mik...@ya...>
Date:   Wed Jun 24 19:21:31 2020 +0300

    jtag/tcl: fix a double free of jim object
    
    The Jim_SetResultFormatted() frees jim object earlier and the
    Jim_FreeNewObj() does it second time. It breaks the memory heap.
    
    To avoid it the Jim_IncrRefCount() + Jim_DecrRefCount() should be used
    instead of the Jim_FreeNewObj() call.
    
    Change-Id: Ifa5f38009b2d617624b5f27e916720888a3dbad9
    Signed-off-by: Mikhail Rasputin <mik...@ya...>
    Reviewed-on: http://openocd.zylin.com/5724
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c
index d2f1f0db5..8b76bff07 100644
--- a/src/jtag/tcl.c
+++ b/src/jtag/tcl.c
@@ -689,8 +689,9 @@ static int jim_jtag_arp_init(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 	int e = jtag_init_inner(context);
 	if (e != ERROR_OK) {
 		Jim_Obj *eObj = Jim_NewIntObj(goi.interp, e);
+		Jim_IncrRefCount(eObj);
 		Jim_SetResultFormatted(goi.interp, "error: %#s", eObj);
-		Jim_FreeNewObj(goi.interp, eObj);
+		Jim_DecrRefCount(goi.interp, eObj);
 		return JIM_ERR;
 	}
 	return JIM_OK;
@@ -713,8 +714,9 @@ static int jim_jtag_arp_init_reset(Jim_Interp *interp, int argc, Jim_Obj *const
 
 	if (e != ERROR_OK) {
 		Jim_Obj *eObj = Jim_NewIntObj(goi.interp, e);
+		Jim_IncrRefCount(eObj);
 		Jim_SetResultFormatted(goi.interp, "error: %#s", eObj);
-		Jim_FreeNewObj(goi.interp, eObj);
+		Jim_DecrRefCount(goi.interp, eObj);
 		return JIM_ERR;
 	}
 	return JIM_OK;

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

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


hooks/post-receive
-- 
Main OpenOCD repository