[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-584-g103b1d68d

[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  103b1d68db5038edd9e8878c798525715590f4e1 (commit)
      from  bc50b8f1b299991851d4ff3eb30f583ed6aa530b (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 103b1d68db5038edd9e8878c798525715590f4e1
Author: Antonio Borneo <bor...@gm...>
Date:   Sat Feb 19 16:56:42 2022 +0100

    gdb_server: check target examined while combining reg list
    
    Commit 6541233aa78d ("Combine register lists of smp targets.")
    assumes that all the targets in the SMP cluster are already
    examined and unconditionally call target_get_gdb_reg_list_noread()
    that will in turn return error if the target is not examined yet.
    
    Skip targets not examined yet.
    Add an additional check in case the register list cannot be built,
    e.g. because no target in the SMP cluster is examined. This should
    never happen, but it's better to play safe.
    
    Change-Id: I8609815c3d5144790fb05a870cb0c931540aef8a
    Fixes: 6541233aa78d ("Combine register lists of smp targets.")
    Reported-by: Michele Bisogno <mic...@re...>
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/6853
    Tested-by: jenkins
    Reviewed-by: Michele Bisogno <mic...@re...>
    Reviewed-by: Tim Newsome <ti...@si...>

diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index f8a1aac83..4dee7e864 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -2281,6 +2281,9 @@ static int smp_reg_list_noread(struct target *target,
 
 	struct target_list *head;
 	foreach_smp_target(head, target->smp_targets) {
+		if (!target_was_examined(head->target))
+			continue;
+
 		struct reg **reg_list = NULL;
 		int reg_list_size;
 		int result = target_get_gdb_reg_list_noread(head->target, &reg_list,
@@ -2329,8 +2332,17 @@ static int smp_reg_list_noread(struct target *target,
 		free(reg_list);
 	}
 
+	if (local_list_size == 0) {
+		LOG_ERROR("Unable to get register list");
+		free(local_list);
+		return ERROR_FAIL;
+	}
+
 	/* Now warn the user about any registers that weren't found in every target. */
 	foreach_smp_target(head, target->smp_targets) {
+		if (!target_was_examined(head->target))
+			continue;
+
 		struct reg **reg_list = NULL;
 		int reg_list_size;
 		int result = target_get_gdb_reg_list_noread(head->target, &reg_list,

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

Summary of changes:
 src/server/gdb_server.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)


hooks/post-receive
-- 
Main OpenOCD repository