From 9adb25915092daa4096911d04fadb5d496c926a6 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 29 Oct 2019 10:25:09 +0000 Subject: [PATCH] Fix a potential illegal array access in the D30V disassembler. * d30v-dis.c (print_insn): Check that operand index is valid before attempting to access the operands array. --- opcodes/ChangeLog | 5 +++++ opcodes/d30v-dis.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index d596729a116..ae2e00ce9b6 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2019-10-29 Nick Clifton + + * d30v-dis.c (print_insn): Check that operand index is valid + before attempting to access the operands array. + 2019-10-29 Nick Clifton * ia64-opc.c (locate_opcode_ent): Prevent a negative shift when diff --git a/opcodes/d30v-dis.c b/opcodes/d30v-dis.c index 2861ca5ad08..8dd43fb984e 100644 --- a/opcodes/d30v-dis.c +++ b/opcodes/d30v-dis.c @@ -23,6 +23,7 @@ #include "opcode/d30v.h" #include "disassemble.h" #include "opintl.h" +#include "libiberty.h" #define PC_MASK 0xFFFFFFFF @@ -313,7 +314,9 @@ print_insn (struct disassemble_info *info, (*info->fprintf_func) (info->stream, "0x%x", val); } /* If there is another operand, then write a comma and space. */ - if (insn->form->operands[opind] && !(found_control && opind == 2)) + if (opind < (int) ARRAY_SIZE (insn->form->operands) + && insn->form->operands[opind] + && !(found_control && opind == 2)) need_comma = 1; } if (need_paren) -- 2.30.2