This commit was manufactured by cvs2svn to create branch 'binutils-

[external/binutils.git] / opcodes / dis-buf.c

diff --git a/opcodes/dis-buf.c b/opcodes/dis-buf.c
index 6a31772..372fb96 100644 (file)
--- a/opcodes/dis-buf.c
+++ b/opcodes/dis-buf.c
@@ -1,6 +1,6 @@
 /* Disassemble from a buffer, for GNU.
    Copyright 1993, 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2005,
-   2007  Free Software Foundation, Inc.
+   2007, 2009, 2010  Free Software Foundation, Inc.
 
    This file is part of the GNU opcodes library.
 
@@ -38,6 +38,7 @@ buffer_read_memory (bfd_vma memaddr,
   unsigned int octets = (memaddr - info->buffer_vma) * opb;
 
   if (memaddr < info->buffer_vma
+      || memaddr - info->buffer_vma > max_addr_offset
       || memaddr - info->buffer_vma + end_addr_offset > max_addr_offset)
     /* Out of bounds.  Use EIO because GDB uses it.  */
     return EIO;