[binutils-gdb] Fix a potential illegal array access in the D30V disassembler.

Nick Clifton nickc@sourceware.org
Tue Oct 29 10:25:00 GMT 2019


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=9adb25915092daa4096911d04fadb5d496c926a6

commit 9adb25915092daa4096911d04fadb5d496c926a6
Author: Nick Clifton <nickc@redhat.com>
Date:   Tue Oct 29 10:25:09 2019 +0000

    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.

Diff:
---
 opcodes/ChangeLog  | 5 +++++
 opcodes/d30v-dis.c | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index d596729..ae2e00c 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,5 +1,10 @@
 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.
+
+2019-10-29  Nick Clifton  <nickc@redhat.com>
+
 	* ia64-opc.c (locate_opcode_ent): Prevent a negative shift when
 	locating the bit to be tested.
 
diff --git a/opcodes/d30v-dis.c b/opcodes/d30v-dis.c
index 2861ca5..8dd43fb 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)



More information about the Binutils-cvs mailing list