fix cp-namespace.c
cp_lookup_symbol_imports_or_template could return without running cleanups. * cp-namespace.c (cp_lookup_symbol_imports_or_template): Call do_cleanups on all return paths.
This commit is contained in:
parent
5ae85e4448
commit
c27e16e3f1
2 changed files with 9 additions and 1 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
2013-05-30 Tom Tromey <tromey@redhat.com>
|
||||||
|
|
||||||
|
* cp-namespace.c (cp_lookup_symbol_imports_or_template): Call
|
||||||
|
do_cleanups on all return paths.
|
||||||
|
|
||||||
2013-05-30 Tom Tromey <tromey@redhat.com>
|
2013-05-30 Tom Tromey <tromey@redhat.com>
|
||||||
|
|
||||||
* top.c (execute_command): Discard 'cleanup_if_error' cleanups.
|
* top.c (execute_command): Discard 'cleanup_if_error' cleanups.
|
||||||
|
|
|
@ -499,7 +499,10 @@ cp_lookup_symbol_imports_or_template (const char *scope,
|
||||||
TYPE_N_TEMPLATE_ARGUMENTS (context),
|
TYPE_N_TEMPLATE_ARGUMENTS (context),
|
||||||
TYPE_TEMPLATE_ARGUMENTS (context));
|
TYPE_TEMPLATE_ARGUMENTS (context));
|
||||||
if (result != NULL)
|
if (result != NULL)
|
||||||
return result;
|
{
|
||||||
|
do_cleanups (cleanups);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
do_cleanups (cleanups);
|
do_cleanups (cleanups);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue