FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* p-valprint.c (pascal_object_print_value): Replace potentially

Browse source 
unsafe alloca with xmalloc/xfree.
	* valops.c (search_struct_method): Likewise.
This commit is contained in:
Siddhesh Poyarekar 2012-07-23 18:08:29 +00:00
parent 695c31738b
commit 6c18f3e0f4
3 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gdb/ChangeLog
View file

@ -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.

8
gdb/p-valprint.c
View file

@ -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;

10
gdb/valops.c
View file

@ -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
{