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 599fab3304e8901be31fe516b17098bffc8be7b9..0a3ab05d506cb2482a59b4382434fce2eec1b06c 100644 (file)
--- 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 fe4b36712d35da9798d59f9e8da8e8155c8f3793..8608bc82507ca344153535c332fdcd45d6ebf0fd 100644 (file)
--- 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.  */