From a4f0544b1ba516db0ab9715e4cccc78bc098ebc9 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 9 Feb 2021 12:15:39 -0700 Subject: [PATCH] Avoid crash in resolve_dynamic_struct resolve_dynamic_struct says: gdb_assert (type->num_fields () > 0); However, a certain Ada program has a structure with no fields but with a dynamic size, causing this assertion to fire. It is difficult to be certain, but we think this is a compiler bug. However, in the meantime this assertion does not seem to be checking any kind of internal consistency; so this patch removes it. gdb/ChangeLog 2021-02-09 Tom Tromey * gdbtypes.c (resolve_dynamic_struct): Handle structure with no fields. --- gdb/ChangeLog | 5 +++++ gdb/gdbtypes.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e67668d315c..6470c996a30 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2021-02-09 Tom Tromey + + * gdbtypes.c (resolve_dynamic_struct): Handle structure with no + fields. + 2021-02-08 Shahab Vahedi PR tdep/27369 diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index c736dff2ca8..1b2d4836959 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -2545,7 +2545,6 @@ resolve_dynamic_struct (struct type *type, unsigned resolved_type_bit_length = 0; gdb_assert (type->code () == TYPE_CODE_STRUCT); - gdb_assert (type->num_fields () > 0); resolved_type = copy_type (type); @@ -2564,9 +2563,10 @@ resolve_dynamic_struct (struct type *type, ((struct field *) TYPE_ALLOC (resolved_type, resolved_type->num_fields () * sizeof (struct field))); - memcpy (resolved_type->fields (), - type->fields (), - resolved_type->num_fields () * sizeof (struct field)); + if (type->num_fields () > 0) + memcpy (resolved_type->fields (), + type->fields (), + resolved_type->num_fields () * sizeof (struct field)); } for (i = 0; i < resolved_type->num_fields (); ++i) -- 2.30.2