S12Z disassembler memory leak

	* s12z-opc.c (exg_sex_discrim): Don't leak memory on invalid
	registers.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 7832435374e1cfc741e87c5b2e089b6fa3e5fbb1..2183b2383fa3691c421fcfb5d4702d84f9b5eea3 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2019-12-08  Alan Modra  <amodra@gmail.com>
+
+       * s12z-opc.c (exg_sex_discrim): Don't leak memory on invalid
+       registers.
+
 2019-12-05  Jan Beulich  <jbeulich@suse.com>
 
        * aarch64-tbl.h (aarch64_feature_crypto,

diff --git a/opcodes/s12z-opc.c b/opcodes/s12z-opc.c
index e7a3577ef7d5e70aaeaaf7268ea30d9f79a3e3bc..475c9eb5f1e79af0e61f992872cc8e292de1ce67 100644 (file)
--- a/opcodes/s12z-opc.c
+++ b/opcodes/s12z-opc.c
@@ -2195,32 +2195,32 @@ loop_prim_n_bytes (struct mem_read_abstraction_base *mra)
 \f
 
 static enum optr
-exg_sex_discrim (struct mem_read_abstraction_base *mra, enum optr hint ATTRIBUTE_UNUSED)
+exg_sex_discrim (struct mem_read_abstraction_base *mra,
+                enum optr hint ATTRIBUTE_UNUSED)
 {
   uint8_t eb;
   int status = mra->read (mra, 0, 1, &eb);
+  enum optr operator = OP_INVALID;
   if (status < 0)
-    return OP_INVALID;
+    return operator;
 
   struct operand *op0 = create_register_operand ((eb & 0xf0) >> 4);
   struct operand *op1 = create_register_operand (eb & 0xf);
 
   int reg0 = ((struct register_operand *) op0)->reg;
-  if (reg0 < 0 || reg0 >= S12Z_N_REGISTERS)
-    return OP_INVALID;
-
   int reg1 = ((struct register_operand *) op1)->reg;
-  if (reg1 < 0 || reg1 >= S12Z_N_REGISTERS)
-    return OP_INVALID;
-
-  const struct reg *r0 = registers + reg0;
-  const struct reg *r1 = registers + reg1;
+  if (reg0 >= 0 && reg0 < S12Z_N_REGISTERS
+      && reg1 >= 0 && reg1 < S12Z_N_REGISTERS)
+    {
+      const struct reg *r0 = registers + reg0;
+      const struct reg *r1 = registers + reg1;
 
-  enum optr operator = (r0->bytes < r1->bytes) ? OP_sex : OP_exg;
+      operator = r0->bytes < r1->bytes ? OP_sex : OP_exg;
+    }
 
   free (op0);
   free (op1);
-  
+
   return operator;
 }