From 25d40a626d36c140c8bb309f410f25af2836ec9b Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 16 Apr 2020 15:41:57 +0200 Subject: libcpu: Replace assert with goto invalid_op for bad prefix. https://sourceware.org/bugzilla/show_bug.cgi?id=25831 Signed-off-by: Mark Wielaard --- libcpu/i386_disasm.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'libcpu/i386_disasm.c') diff --git a/libcpu/i386_disasm.c b/libcpu/i386_disasm.c index 4422ffa2..32df8cd0 100644 --- a/libcpu/i386_disasm.c +++ b/libcpu/i386_disasm.c @@ -407,7 +407,8 @@ i386_disasm (Ebl *ebl __attribute__((unused)), ++curr; - assert (last_prefix_bit != 0); + if (last_prefix_bit == 0) + goto invalid_op; correct_prefix = last_prefix_bit; } @@ -445,8 +446,8 @@ i386_disasm (Ebl *ebl __attribute__((unused)), the input data. */ goto do_ret; - assert (correct_prefix == 0 - || (prefixes & correct_prefix) != 0); + if (correct_prefix != 0 && (prefixes & correct_prefix) == 0) + goto invalid_op; prefixes ^= correct_prefix; if (0) @@ -473,7 +474,8 @@ i386_disasm (Ebl *ebl __attribute__((unused)), if (data == end) { - assert (prefixes != 0); + if (prefixes == 0) + goto invalid_op; goto print_prefix; } @@ -1125,6 +1127,7 @@ i386_disasm (Ebl *ebl __attribute__((unused)), } /* Invalid (or at least unhandled) opcode. */ + invalid_op: if (prefixes != 0) goto print_prefix; /* Make sure we get past the unrecognized opcode if we haven't yet. */ -- cgit v1.2.3