From: Alan Modra <amodra@gmail.com>
Date: Mon, 19 Mar 2001 12:20:39 +0000 (+0000)
Subject: Don't try to read past end of info buffer, and correct test results.
X-Git-Tag: binutils-2_11~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c09e00af10cc21e0f0001e3e66c54525e823f4bd;p=thirdparty%2Fbinutils-gdb.git

Don't try to read past end of info buffer, and correct test results.
---

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 6c4ac54d0b3..838f58cc36f 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-19  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* gas/vax/quad.exp: Correct expected result.
+
 2001-03-19  Andreas Schwab  <schwab@suse.de>
 
 	* gas/m68k/pcrel.s: Force alignment to 8 byte boundary to get
diff --git a/gas/testsuite/gas/vax/quad.exp b/gas/testsuite/gas/vax/quad.exp
index 34770c5b6cf..46fc9ca52d4 100644
--- a/gas/testsuite/gas/vax/quad.exp
+++ b/gas/testsuite/gas/vax/quad.exp
@@ -8,7 +8,7 @@ proc do_quad {} {
 	expect {
 	    -re "^ +2\[ \t\]+0000+ 7D8F7856\[ \t\]+movq\[^\n\]*\n" { set x1 1 }
 	    -re "^ +2\[ \t\]+3412DDCC\[^\n\]*\n"		   { set x2 1 }
-	    -re "^ +2\[ \t\]+BBAA5001\[ \t\]*\r\n"		   { set x3 1 }
+	    -re "^ +2\[ \t\]+BBAA50\[ \t\]*\r\n"		   { set x3 1 }
 	    -re "\[^\n\]*\n"				{ }
 	    timeout				{ perror "timeout\n"; break }
 	    eof					{ break }
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 0b7df7362aa..63ad78f559f 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-19  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* vax-dis.c (print_insn_vax): Only fetch two bytes if the info buffer
+	has more than one byte left to read.
+
 2001-02-23  David Mosberger  <davidm@hpl.hp.com>
 
 	* ia64-opc-a.c: Add missing pseudo-ops for "cmp" and "cmp4".
diff --git a/opcodes/vax-dis.c b/opcodes/vax-dis.c
index 29641f1768f..975d3dbe48b 100644
--- a/opcodes/vax-dis.c
+++ b/opcodes/vax-dis.c
@@ -1,5 +1,5 @@
 /* Print VAX instructions.
-   Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1998, 2001 Free Software Foundation, Inc.
    Contributed by Pauline Middelink <middelin@polyware.iaf.nl>
 
 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;