From: Siddhesh Poyarekar <siddhesh@sourceware.org>
Date: Mon, 23 Jul 2012 18:08:29 +0000 (+0000)
Subject: 	* p-valprint.c (pascal_object_print_value): Replace potentially
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6c18f3e0f4d7e0399b39a0d554b5152af71a94e2;p=binutils-gdb.git

	* p-valprint.c (pascal_object_print_value): Replace potentially
	unsafe alloca with xmalloc/xfree.
	* valops.c (search_struct_method): Likewise.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c4712518a1a..062eefdd932 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-23  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+	* p-valprint.c (pascal_object_print_value): Replace potentially
+	unsafe alloca with xmalloc/xfree.
+	* valops.c (search_struct_method): Likewise.
+
 2012-07-23  Tom Tromey  <tromey@redhat.com>
 
 	* solib-svr4.c (enable_break): Update.
diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c
index b8434ed256f..9f4461723d9 100644
--- a/gdb/p-valprint.c
+++ b/gdb/p-valprint.c
@@ -797,8 +797,11 @@ pascal_object_print_value (struct type *type, const gdb_byte *valaddr,
 
 	  if (boffset < 0 || boffset >= TYPE_LENGTH (type))
 	    {
-	      /* FIXME (alloc): not safe is baseclass is really really big. */
-	      gdb_byte *buf = alloca (TYPE_LENGTH (baseclass));
+	      gdb_byte *buf;
+	      struct cleanup *back_to;
+
+	      buf = xmalloc (TYPE_LENGTH (baseclass));
+	      back_to = make_cleanup (xfree, buf);
 
 	      base_valaddr = buf;
 	      if (target_read_memory (address + boffset, buf,
@@ -807,6 +810,7 @@ pascal_object_print_value (struct type *type, const gdb_byte *valaddr,
 	      address = address + boffset;
 	      thisoffset = 0;
 	      boffset = 0;
+	      do_cleanups (back_to);
 	    }
 	  else
 	    base_valaddr = valaddr;
diff --git a/gdb/valops.c b/gdb/valops.c
index 97d889b2bcf..f6d8441581d 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -2281,8 +2281,13 @@ search_struct_method (const char *name, struct value **arg1p,
 
 	  if (offset < 0 || offset >= TYPE_LENGTH (type))
 	    {
-	      gdb_byte *tmp = alloca (TYPE_LENGTH (baseclass));
-	      CORE_ADDR address = value_address (*arg1p);
+	      gdb_byte *tmp;
+	      struct cleanup *back_to;
+	      CORE_ADDR address;
+
+	      tmp = xmalloc (TYPE_LENGTH (baseclass));
+	      back_to = make_cleanup (xfree, tmp);
+	      address = value_address (*arg1p);
 
 	      if (target_read_memory (address + offset,
 				      tmp, TYPE_LENGTH (baseclass)) != 0)
@@ -2293,6 +2298,7 @@ search_struct_method (const char *name, struct value **arg1p,
 							  address + offset);
 	      base_valaddr = value_contents_for_printing (base_val);
 	      this_offset = 0;
+	      do_cleanups (back_to);
 	    }
 	  else
 	    {