Browse Source

disassembly: fix access to undefined memory pointer upon unknown instruction

return error message instead. Found by clang.

Change-Id: Ica109d077206236a12d007e77cc78061ffd05834
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Reviewed-on: http://openocd.zylin.com/169
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
tags/v0.6.0-rc1
Øyvind Harboe 12 years ago
committed by Spencer Oliver
parent
commit
6fa4c5a456
1 changed files with 5 additions and 5 deletions
  1. +5
    -5
      src/target/arm_disassembler.c

+ 5
- 5
src/target/arm_disassembler.c View File

@@ -280,13 +280,13 @@ static int evaluate_ldc_stc_mcrr_mrrc(uint32_t opcode,
{
instruction->type = ARM_MCRR;
mnemonic = "MCRR";
}

/* MRRC */
if ((opcode & 0x0ff00000) == 0x0c500000)
{
} else if ((opcode & 0x0ff00000) == 0x0c500000) {
/* MRRC */
instruction->type = ARM_MRRC;
mnemonic = "MRRC";
} else {
LOG_ERROR("Unknown instruction");
return ERROR_FAIL;
}

snprintf(instruction->text, 128,


Loading…
Cancel
Save