From d5161074ccccf328ee055eee45b88284939b4fe2 Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Fri, 6 Jul 2012 05:36:07 +0000 Subject: [PATCH] * cp-valprint.c (cp_print_value): Replace potentially unsafe alloca with xmalloc/xfree. --- gdb/ChangeLog | 6 ++++++ gdb/cp-valprint.c | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 355c2755e7b..e432894d5d1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2012-07-06 Siddhesh Poyarekar + Jan Kratochvil + + * cp-valprint.c (cp_print_value): Replace potentially unsafe + alloca with xmalloc/xfree. + 2012-07-06 Siddhesh Poyarekar * MAINTAINERS (Write After Approval): Add myself to the list. diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c index 2e3beeaf324..c066aa5e742 100644 --- a/gdb/cp-valprint.c +++ b/gdb/cp-valprint.c @@ -554,9 +554,11 @@ cp_print_value (struct type *type, struct type *real_type, if ((boffset + offset) < 0 || (boffset + offset) >= TYPE_LENGTH (real_type)) { - /* FIXME (alloca): unsafe if baseclass is really - really large. */ - 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); if (target_read_memory (address + boffset, buf, TYPE_LENGTH (baseclass)) != 0) @@ -568,6 +570,7 @@ cp_print_value (struct type *type, struct type *real_type, boffset = 0; thistype = baseclass; base_valaddr = value_contents_for_printing_const (base_val); + do_cleanups (back_to); } else { -- 2.30.2