aboutsummaryrefslogtreecommitdiff
path: root/src/target/cortex_m.c
diff options
context:
space:
mode:
authorDaniel Trnka <daniel.trnka@gmail.com>2020-08-17 17:51:43 +0200
committerAntonio Borneo <borneo.antonio@gmail.com>2020-10-03 11:21:33 +0100
commit87b95ab21292166eed23693616c9ee21a2c5a0c0 (patch)
tree9bf7ffd5d3d12dad41cd0c4f9b28f9be3fcb6675 /src/target/cortex_m.c
parentd7d70c2719e6fe94dc9ca15aeb81cf142d597cdc (diff)
downloadriscv-openocd-87b95ab21292166eed23693616c9ee21a2c5a0c0.zip
riscv-openocd-87b95ab21292166eed23693616c9ee21a2c5a0c0.tar.gz
riscv-openocd-87b95ab21292166eed23693616c9ee21a2c5a0c0.tar.bz2
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>
Diffstat (limited to 'src/target/cortex_m.c')
-rw-r--r--src/target/cortex_m.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index e52332d..55664a7 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;