From: Andrew Stubbs <andrew.stubbs@st.com>
Date: Fri, 19 Sep 2008 18:12:17 +0000 (+0000)
Subject: 2008-09-19  Andrew Stubbs  <ams@codesourcery.com>
X-Git-Tag: reverse-20080930-branchpoint~94
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f27f2a479adae58f900b42305bbddd6487a50a5;p=thirdparty%2Fbinutils-gdb.git

2008-09-19  Andrew Stubbs  <ams@codesourcery.com>

	* frame.c (get_frame_register_bytes): Detect bad debug info.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 65f60a9aeec..b88390d46ce 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-19  Andrew Stubbs  <ams@codesourcery.com>
+
+	* frame.c (get_frame_register_bytes): Detect bad debug info.
+
 2008-09-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	Fix a crash on uninitialized ECS->EVENT_THREAD for a newly found thread.
diff --git a/gdb/frame.c b/gdb/frame.c
index 55ded716825..88d51f782d9 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -796,6 +796,8 @@ get_frame_register_bytes (struct frame_info *frame, int regnum,
 			  CORE_ADDR offset, int len, gdb_byte *myaddr)
 {
   struct gdbarch *gdbarch = get_frame_arch (frame);
+  int i;
+  int maxsize;
 
   /* Skip registers wholly inside of OFFSET.  */
   while (offset >= register_size (gdbarch, regnum))
@@ -804,6 +806,22 @@ get_frame_register_bytes (struct frame_info *frame, int regnum,
       regnum++;
     }
 
+  /* Detect bad debug info.  */
+  maxsize = -offset;
+  for (i = regnum; i < gdbarch_num_regs (gdbarch); i++)
+    {
+      int thissize = register_size (gdbarch, i);
+      if (thissize == 0)
+	break;
+      maxsize += thissize;
+    }
+  if (len > maxsize)
+    {
+      warning (_("Bad debug information detected: "
+		 "Attempt to read %d bytes from registers."), len);
+      return 0;
+    }
+
   /* Copy the data.  */
   while (len > 0)
     {