merge from gcc

[deliverable/binutils-gdb.git] / libiberty / cp-demangle.c

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.  */