2011-02-28 Michael Snyder <msnyder@vmware.com>

	* breakpoint.c (breakpoint_adjustment_warning): Make local char
	buffers a little bigger, to avoid possibility of an overflow.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 557f89f1ff124381795cde346b152e50c19be11f..8fcf424b159377c455141274bd3aee51354de7ff 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2011-02-28  Michael Snyder  <msnyder@vmware.com>
 
+       * breakpoint.c (breakpoint_adjustment_warning): Make local char
+       buffers a little bigger, to avoid possibility of an overflow.
+
        * coffread.c (coff_getfilename): Add check to avoid overflow.
 
        * objc-lang.c (selectors_info): Add a small safety margin to 

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index bb9927c408af86b5958072c6b6a4829c9439ccba..3fb8aab5fb08d5c3add7ed09c881e518c80521aa 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -5504,8 +5504,10 @@ static void
 breakpoint_adjustment_warning (CORE_ADDR from_addr, CORE_ADDR to_addr,
                                int bnum, int have_bnum)
 {
-  char astr1[40];
-  char astr2[40];
+  /* The longest string possibly returned by hex_string_custom
+     is 50 chars.  These must be at least that big for safety.  */
+  char astr1[64];
+  char astr2[64];
 
   strcpy (astr1, hex_string_custom ((unsigned long) from_addr, 8));
   strcpy (astr2, hex_string_custom ((unsigned long) to_addr, 8));