Commit: Fix potential illegal array access in D30V disassembler

Message ID 87bltzn91b.fsf@redhat.com
State New
Headers show
Series
  • Commit: Fix potential illegal array access in D30V disassembler
Related show

Commit Message

Nick Clifton Oct. 29, 2019, 10:25 a.m.
Hi Guys,

  I am applying the patch below to fix a potential illegal array access
  in the D30V disassembler.

Cheers
  Nick

opcodes/ChangeLog
2019-10-29  Nick Clifton  <nickc@redhat.com>

	* d30v-dis.c (print_insn): Check that operand index is valid
	before attempting to access the operands array.

Patch

diff --git a/opcodes/d30v-dis.c b/opcodes/d30v-dis.c
index 2861ca5ad0..8dd43fb984 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)