diff options
| author | Tom Tromey <tromey@adacore.com> | 2020-11-04 08:49:16 -0700 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2020-11-04 08:49:16 -0700 |
| commit | 75fd6a26f893fbee0ebd665612e115c0735274ab (patch) | |
| tree | 0b13eb7086bf9ab771fe01db0574601e131de5ee | |
| parent | 93f9561e0fa112bab102dc2c22dd114c84c06a16 (diff) | |
| download | binutils-75fd6a26f893fbee0ebd665612e115c0735274ab.zip binutils-75fd6a26f893fbee0ebd665612e115c0735274ab.tar.gz binutils-75fd6a26f893fbee0ebd665612e115c0735274ab.tar.bz2 | |
Avoid crash in ada-lang.c:to_fixed_array_type
When debugging Ada programs compiled by certain versions of GNAT with
-fgnat-encodings=minimal, gdb can crash. These crashes occur when
running the gdb test suite, once some of the later patches in this
series have been applied.
This patch works around the bug by throwing an exception in the
failing case. I did not implement a full fix because GNAT has been
changed to emit better DWARF, and so in the near future this will stop
being a problem. (Currently, users don't generally use
-fgnat-encodings=minimal, and the GNAT default will only be changed in
a fully-patched compiler.)
gdb/ChangeLog
2020-11-04 Tom Tromey <tromey@adacore.com>
* ada-lang.c (to_fixed_array_type): Error if
decode_constrained_packed_array_type returns NULL.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/ada-lang.c | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 188bb1e..9b905ee 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2020-11-04 Tom Tromey <tromey@adacore.com> + * ada-lang.c (to_fixed_array_type): Error if + decode_constrained_packed_array_type returns NULL. + +2020-11-04 Tom Tromey <tromey@adacore.com> + * dwarf2/leb.h (read_3_bytes): Use bfd_get_24. 2020-11-02 Tom Tromey <tromey@adacore.com> diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index a1f5d93..941b35f 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -8350,7 +8350,11 @@ to_fixed_array_type (struct type *type0, struct value *dval, constrained_packed_array_p = ada_is_constrained_packed_array_type (type0); if (constrained_packed_array_p) - type0 = decode_constrained_packed_array_type (type0); + { + type0 = decode_constrained_packed_array_type (type0); + if (type0 == nullptr) + error (_("could not decode constrained packed array type")); + } index_type_desc = ada_find_parallel_type (type0, xa_suffix); |