From b3ac5c6c286c5b5c1909628e85754edfb403cf1a Mon Sep 17 00:00:00 2001 From: Tamar Christina Date: Tue, 1 May 2018 17:11:11 +0100 Subject: Fix unintialized memory in aarch64 opcodes. This patch fixes an issue where the memory for the opcode structure is not zero'd before the first exit branch. So there is one failure mode for which uninitialized memory is returned. This causes weird failures when the return code is not checked before inst is used. opcodes/ * aarch64-dis.c (aarch64_opcode_decode): Moved memory clear code. --- opcodes/aarch64-dis.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'opcodes/aarch64-dis.c') diff --git a/opcodes/aarch64-dis.c b/opcodes/aarch64-dis.c index c63f595..e7bece9 100644 --- a/opcodes/aarch64-dis.c +++ b/opcodes/aarch64-dis.c @@ -2733,6 +2733,9 @@ aarch64_opcode_decode (const aarch64_opcode *opcode, const aarch64_insn code, assert (opcode && inst); + /* Clear inst. */ + memset (inst, '\0', sizeof (aarch64_inst)); + /* Check the base opcode. */ if ((code & opcode->mask) != (opcode->opcode & opcode->mask)) { @@ -2740,9 +2743,6 @@ aarch64_opcode_decode (const aarch64_opcode *opcode, const aarch64_insn code, goto decode_fail; } - /* Clear inst. */ - memset (inst, '\0', sizeof (aarch64_inst)); - inst->opcode = opcode; inst->value = code; -- cgit v1.1