From: Ian Lance Taylor <ian@wasabisystems.com>
Date: Mon, 28 Jun 2004 15:23:33 +0000 (+0000)
Subject: re PR c++/16240 (g++ generates incorrect mangled name)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=00a5aa9c30c9eeb2cfb3b691b88dbee1fbbe5a4b;p=gcc.git

re PR c++/16240 (g++ generates incorrect mangled name)

	PR other/16240
	* cp-demangle.c (d_expr_primary): Check for a failure return from
	cplus_demangle_type.

From-SVN: r83791
---

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 599fab3304e..0a3ab05d506 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-28  Ian Lance Taylor  <ian@wasabisystems.com>
+
+	PR other/16240
+	* cp-demangle.c (d_expr_primary): Check for a failure return from
+	cplus_demangle_type.
+
 2004-05-31  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* pex-win32.c (fix_argv): Expand comment.
diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
index fe4b36712d3..8608bc82507 100644
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -2398,6 +2398,8 @@ d_expr_primary (di)
       const char *s;
 
       type = cplus_demangle_type (di);
+      if (type == NULL)
+	return NULL;
 
       /* If we have a type we know how to print, we aren't going to
 	 print the type name itself.  */