[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-715-g480d4e177

[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  480d4e17727864f75dc60e22cb1a42e022cb1db3 (commit)
      from  70338509ca52a9b78c52a5d464ba2605fbaf193b (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 480d4e17727864f75dc60e22cb1a42e022cb1db3
Author: Erhan Kurubas <erh...@es...>
Date:   Sat May 28 08:30:21 2022 +0200

    semihosting: fix accessing memory outside the bounds of the fn array
    
    There is an accsess to wrong index, when arm semihosting_basedir
    command not used or basedir set to empty string.
    
    Signed-off-by: Erhan Kurubas <erh...@es...>
    Change-Id: I3afa049d74b30496f5c03ba4ef67431784f81bdc
    Fixes: ce5027ab019a ("semihosting: add semihosting_basedir command")
    Reviewed-on: https://review.openocd.org/c/openocd/+/7005
    Tested-by: jenkins
    Reviewed-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/target/semihosting_common.c b/src/target/semihosting_common.c
index 2df6e38ae..0a60eb121 100644
--- a/src/target/semihosting_common.c
+++ b/src/target/semihosting_common.c
@@ -877,9 +877,11 @@ int semihosting_common(struct target *target)
 					semihosting->result = -1;
 					semihosting->sys_errno = ENOMEM;
 				} else {
-					strncpy((char *)fn, semihosting->basedir, basedir_len);
-					if (fn[basedir_len - 1] != '/')
-						fn[basedir_len++] = '/';
+					if (basedir_len > 0) {
+						strcpy((char *)fn, semihosting->basedir);
+						if (fn[basedir_len - 1] != '/')
+							fn[basedir_len++] = '/';
+					}
 					retval = target_read_memory(target, addr, 1, len, fn + basedir_len);
 					if (retval != ERROR_OK) {
 						free(fn);

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

Summary of changes:
 src/target/semihosting_common.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository