From: Daniel Trnka <daniel.trnka@gmail.com>
Date: Mon, 17 Aug 2020 15:51:43 +0000 (+0200)
Subject: target/cortex_m.c: vector_catch command checks if a target is examined
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=87b95ab21292166eed23693616c9ee21a2c5a0c0;p=fw%2Fopenocd

target/cortex_m.c: vector_catch command checks if a target is examined

If a target is not examined, command vector_catch crashes while accessing
the debug_ap NULL pointer.

maskisr and reset_config commands don't require this check.

Change-Id: I949b6f6e8b983327dd98fbe403735141f8f0b5d6
Signed-off-by: Daniel Trnka <daniel.trnka@gmail.com>
Reviewed-on: http://openocd.zylin.com/5813
Tested-by: jenkins
Reviewed-by: Tarek BOCHKATI <tarek.bouchkati@gmail.com>
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
---

diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index e52332dd6..55664a79a 100644
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -2502,6 +2502,11 @@ COMMAND_HANDLER(handle_cortex_m_vector_catch_command)
 	if (retval != ERROR_OK)
 		return retval;
 
+	if (!target_was_examined(target)) {
+		LOG_ERROR("Target not examined yet");
+		return ERROR_FAIL;
+	}
+
 	retval = mem_ap_read_atomic_u32(armv7m->debug_ap, DCB_DEMCR, &demcr);
 	if (retval != ERROR_OK)
 		return retval;