This commit was generated by cvs2svn to compensate for changes in r175790,

which included commits to RCS files with non-trunk default branches.

contrib/binutils/libiberty/cp-demangle.c

@@ -2396,6 +2396,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.  */