From 00a5aa9c30c9eeb2cfb3b691b88dbee1fbbe5a4b Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 28 Jun 2004 15:23:33 +0000 Subject: [PATCH] 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 --- libiberty/ChangeLog | 6 ++++++ libiberty/cp-demangle.c | 2 ++ 2 files changed, 8 insertions(+) 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 + + PR other/16240 + * cp-demangle.c (d_expr_primary): Check for a failure return from + cplus_demangle_type. + 2004-05-31 Danny Smith * 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. */ -- 2.30.2