ubsan: crx: index 5 out of bounds for type 'operand_desc const[5]'

	* crx-dis.c (get_number_of_operands): Don't access operands[]
	out of bounds.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 07f30e27d6be9e2a73d68290380952cd7c84cf97..25c29b235cbc840cafcf125e81e89b59deb5813f 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2019-12-26  Alan Modra  <amodra@gmail.com>
+
+       * crx-dis.c (get_number_of_operands): Don't access operands[]
+       out of bounds.
+
 2019-12-26  Alan Modra  <amodra@gmail.com>
 
        * v850-dis.c (disassemble): Avoid signed overflow.  Don't use

diff --git a/opcodes/crx-dis.c b/opcodes/crx-dis.c
index 38347486169f107d74ffab7db86ed3dc176b9ce6..e44fca111145ca0b0781b933109a1685bef50f80 100644 (file)
--- a/opcodes/crx-dis.c
+++ b/opcodes/crx-dis.c
@@ -105,7 +105,7 @@ get_number_of_operands (void)
 {
   int i;
 
-  for (i = 0; instruction->operands[i].op_type && i < MAX_OPERANDS; i++)
+  for (i = 0; i < MAX_OPERANDS && instruction->operands[i].op_type; i++)
     ;
 
   return i;