*** empty log message ***

[deliverable/binutils-gdb.git] / gdb / cp-support.c

diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index 8cea2c5ce32594e39084a92f0a01635d2076b3d2..0620aa7dbf6b22056fc90566a9a689fb63ce030b 100644 (file)
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -528,6 +528,13 @@ cp_canonicalize_string (const char *string)
   ret = cp_comp_to_string (info->tree, estimated_len);
   cp_demangled_name_parse_free (info);
 
+  if (ret == NULL)
+    {
+      warning (_("internal error: string \"%s\" failed to be canonicalized"),
+              string);
+      return NULL;
+    }
+
   if (strcmp (string, ret) == 0)
     {
       xfree (ret);
@@ -1198,7 +1205,7 @@ make_symbol_overload_list_adl_namespace (struct type *type,
                                          const char *func_name)
 {
   char *namespace;
-  char *type_name;
+  const char *type_name;
   int i, prefix_len;
 
   while (TYPE_CODE (type) == TYPE_CODE_PTR
@@ -1470,7 +1477,7 @@ cp_validate_operator (const char *input)
   const char *p;
   struct expression *expr;
   struct value *val;
-  struct gdb_exception except;
+  volatile struct gdb_exception except;
 
   p = input;