From bbe6d95f460afad7a02a4828fee94a8bf0a2ba63 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 19 Mar 2001 12:20:10 +0000 Subject: Don't try to read past end of info buffer, and correct test results. --- opcodes/vax-dis.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'opcodes/vax-dis.c') diff --git a/opcodes/vax-dis.c b/opcodes/vax-dis.c index d6cb900..e33f87e 100644 --- a/opcodes/vax-dis.c +++ b/opcodes/vax-dis.c @@ -1,5 +1,5 @@ /* Print VAX instructions. - Copyright 1995, 1998, 2000 Free Software Foundation, Inc. + Copyright 1995, 1998, 2000, 2001 Free Software Foundation, Inc. Contributed by Pauline Middelink This program is free software; you can redistribute it and/or modify @@ -126,7 +126,18 @@ print_insn_vax (memaddr, info) return -1; } - FETCH_DATA (info, buffer + 2); + /* Check if the info buffer has more than one byte left since + the last opcode might be a single byte with no argument data. */ + if (info->buffer_length - (memaddr - info->buffer_vma) > 1) + { + FETCH_DATA (info, buffer + 2); + } + else + { + FETCH_DATA (info, buffer + 1); + buffer[1] = 0; + } + for (votp = &votstrs[0]; votp->name[0]; votp++) { register vax_opcodeT opcode = votp->detail.code; -- cgit v1.1