diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 07f30e27d6..25c29b235c 100644
--- 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 3834748616..e44fca1111 100644
--- 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;