darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* linespec.c (find_method): Move name canonicalization outside

Browse source 
the loop.
	Be paranoid and use a cleanup.
This commit is contained in:
Keith Seitz 2010-12-02 20:05:59 +00:00
parent 989abc33c7
commit d03a3acf07
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gdb/ChangeLog
View file

@ -1,3 +1,9 @@
2010-12-02 Keith Seitz <keiths@redhat.com>
* linespec.c (find_method): Move name canonicalization outside
the loop.
Be paranoid and use a cleanup.
2010-12-01 Doug Evans <dje@google.com>
* dwarf2read.c (save_gdb_index_command): Add comment.

23
gdb/linespec.c
View file

@ -1589,15 +1589,20 @@ find_method (int funfirstline, char ***canonical, char *saved_arg,
if (strchr (saved_arg, '(') != NULL)
{
int i;
char *name = saved_arg;
char *canon = cp_canonicalize_string (name);
struct cleanup *cleanup;
if (canon != NULL)
{
name = canon;
cleanup = make_cleanup (xfree, canon);
}
else
cleanup = make_cleanup (null_cleanup, NULL);
for (i = 0; i < i1; ++i)
{
char *name = saved_arg;
char *canon = cp_canonicalize_string (name);
if (canon != NULL)
name = canon;
if (strcmp_iw (name, SYMBOL_LINKAGE_NAME (sym_arr[i])) == 0)
{
values.sals = (struct symtab_and_line *)
@ -1605,13 +1610,9 @@ find_method (int funfirstline, char ***canonical, char *saved_arg,
values.nelts = 1;
values.sals[0] = find_function_start_sal (sym_arr[i],
funfirstline);
if (canon)
xfree (canon);
do_cleanups (cleanup);
return values;
}
if (canon)
xfree (canon);
}
error (_("the class `%s' does not have any method instance named %s\n"),