PR other/16240

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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@83791 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 599fab3..0a3ab05 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 fe4b367..8608bc8 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.  */