aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@wasabisystems.com>2004-06-28 15:23:33 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2004-06-28 15:23:33 +0000
commit00a5aa9c30c9eeb2cfb3b691b88dbee1fbbe5a4b (patch)
tree5bd693b3f3af2ca6bc4477d150883e63f9dd1933
parent3e1f1ba5dc85513e05db6a7605ecd51ba476b597 (diff)
downloadgcc-00a5aa9c30c9eeb2cfb3b691b88dbee1fbbe5a4b.zip
gcc-00a5aa9c30c9eeb2cfb3b691b88dbee1fbbe5a4b.tar.gz
gcc-00a5aa9c30c9eeb2cfb3b691b88dbee1fbbe5a4b.tar.bz2
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
-rw-r--r--libiberty/ChangeLog6
-rw-r--r--libiberty/cp-demangle.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 599fab3..0a3ab05 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 fe4b367..8608bc8 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. */