Fix regresssion(internal-error) printing subprogram argument (PR gdb/22670)

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

diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c
index d8817c03726d55291cb2d9491bc6a2aa5bf26674..185607e4eb84f901dc974dbd26b3ed0bd5815bff 100644 (file)
--- a/gdb/cp-namespace.c
+++ b/gdb/cp-namespace.c
@@ -1,5 +1,5 @@
 /* Helper routines for C++ support in GDB.
-   Copyright (C) 2003-2017 Free Software Foundation, Inc.
+   Copyright (C) 2003-2018 Free Software Foundation, Inc.
 
    Contributed by David Carlton and by Kealia, Inc.
 
@@ -141,7 +141,9 @@ cp_basic_lookup_symbol (const char *name, const struct block *block,
 
       if (global_block != NULL)
        {
-         sym.symbol = lookup_symbol_in_block (name, global_block, domain);
+         sym.symbol = lookup_symbol_in_block (name,
+                                              symbol_name_match_type::FULL,
+                                              global_block, domain);
          sym.block = global_block;
        }
     }
@@ -1049,7 +1051,7 @@ cp_lookup_transparent_type_loop (const char *name,
 
   full_name = (char *) alloca (scope_length + 2 + strlen (name) + 1);
   strncpy (full_name, scope, scope_length);
-  strncpy (full_name + scope_length, "::", 2);
+  memcpy (full_name + scope_length, "::", 2);
   strcpy (full_name + scope_length + 2, name);
 
   return basic_lookup_transparent_type (full_name);