From: Alan Modra <amodra@gmail.com>
Date: Fri, 17 Apr 2020 01:08:16 +0000 (+0930)
Subject: PR25840, Null pointer dereference in objdump
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ca3f923f82a079dcf441419f4a50a50f8b4b33c2;p=binutils-gdb.git

PR25840, Null pointer dereference in objdump

	PR 25840
	* debug.c (debug_class_type_samep): Don't segfault on NULL type.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 3d83813f296..5c9c18bd52e 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 022fa4edffb..5470e155edc 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),