diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/cp-namespace.c | 22 |
2 files changed, 17 insertions, 10 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index afb0dc2..5ef59fc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2004-02-09 Daniel Jacobowitz <drow@mvista.com> + + * cp-namespace.c (check_one_possible_namespace_symbol): Don't use + obstack_free. + 2004-02-09 Andrew Cagney <cagney@redhat.com> * blockframe.c (find_pc_partial_function): If find_pc_overlay diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c index 65d3ecc..a731352 100644 --- a/gdb/cp-namespace.c +++ b/gdb/cp-namespace.c @@ -783,14 +783,20 @@ check_one_possible_namespace_symbol (const char *name, int len, struct objfile *objfile) { struct block *block = get_possible_namespace_block (objfile); - char *name_copy = obsavestring (name, len, &objfile->objfile_obstack); - struct symbol *sym = lookup_block_symbol (block, name_copy, NULL, - VAR_DOMAIN); + char *name_copy = alloca (len + 1); + struct symbol *sym; + + memcpy (name_copy, name, len); + name_copy[len] = '\0'; + sym = lookup_block_symbol (block, name_copy, NULL, VAR_DOMAIN); if (sym == NULL) { - struct type *type = init_type (TYPE_CODE_NAMESPACE, 0, 0, - name_copy, objfile); + struct type *type; + name_copy = obsavestring (name, len, &objfile->objfile_obstack); + + type = init_type (TYPE_CODE_NAMESPACE, 0, 0, name_copy, objfile); + TYPE_TAG_NAME (type) = TYPE_NAME (type); sym = obstack_alloc (&objfile->objfile_obstack, sizeof (struct symbol)); @@ -806,11 +812,7 @@ check_one_possible_namespace_symbol (const char *name, int len, return 0; } else - { - obstack_free (&objfile->objfile_obstack, name_copy); - - return 1; - } + return 1; } /* Look for a symbol named NAME in all the possible namespace blocks. |