aboutsummaryrefslogtreecommitdiff
path: root/binutils
diff options
context:
space:
mode:
Diffstat (limited to 'binutils')
-rw-r--r--binutils/ChangeLog5
-rw-r--r--binutils/debug.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 3d83813..5c9c18b 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2020-04-17 Alan Modra <amodra@gmail.com>
+
+ PR 25840
+ * debug.c (debug_class_type_samep): Don't segfault on NULL type.
+
2020-04-16 Alan Modra <amodra@gmail.com>
* doc/binutils.texi: Mention --no-show-raw-insn in objdump
diff --git a/binutils/debug.c b/binutils/debug.c
index 022fa4e..5470e15 100644
--- a/binutils/debug.c
+++ b/binutils/debug.c
@@ -3277,6 +3277,8 @@ debug_class_type_samep (struct debug_handle *info, struct debug_type_s *t1,
names, since that sometimes fails in the presence of
typedefs and we really don't care. */
if (strcmp (f1->name, f2->name) != 0
+ || f1->type == NULL
+ || f2->type == NULL
|| ! debug_type_samep (info,
debug_get_real_type ((void *) info,
f1->type, NULL),