Re-added with correct permissions

[deliverable/binutils-gdb.git] / gdb / cp-valprint.c

diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index 2e3beeaf324cc939896a0be69b6099d90c1e559c..e6a99ecb873e84175248e440fc7914f3aceaae4c 100644 (file)
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -210,7 +210,9 @@ cp_print_value_fields (struct type *type, struct type *real_type,
     {
       int statmem_obstack_initial_size = 0;
       int stat_array_obstack_initial_size = 0;
-      
+      struct type *vptr_basetype = NULL;
+      int vptr_fieldno;
+
       if (dont_print_statmem == 0)
        {
          statmem_obstack_initial_size =
@@ -225,6 +227,7 @@ cp_print_value_fields (struct type *type, struct type *real_type,
            }
        }
 
+      vptr_fieldno = get_vptr_fieldno (type, &vptr_basetype);
       for (i = n_baseclasses; i < len; i++)
        {
          /* If requested, skip printing of static fields.  */
@@ -358,7 +361,7 @@ cp_print_value_fields (struct type *type, struct type *real_type,
                                           v, stream, recurse + 1,
                                           options);
                }
-             else if (i == TYPE_VPTR_FIELDNO (type))
+             else if (i == vptr_fieldno && type == vptr_basetype)
                {
                  int i_offset = offset + TYPE_FIELD_BITPOS (type, i) / 8;
                  struct type *i_type = TYPE_FIELD_TYPE (type, i);
@@ -554,9 +557,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 +573,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
                {