From 9ee6bb930d0c1e44c3970965e0c981fa4c06dd8b Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 13 Mar 2009 21:02:58 +0000 Subject: [PATCH] * symtab.c (lookup_symbol_in_language): Use a cleanup. --- gdb/ChangeLog | 4 ++++ gdb/symtab.c | 9 ++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3e592a373f5..e29ef67a6c6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2009-03-13 Tom Tromey + + * symtab.c (lookup_symbol_in_language): Use a cleanup. + 2009-03-13 Doug Evans * exceptions.h: Clean up some comments on catch_exceptions usage. diff --git a/gdb/symtab.c b/gdb/symtab.c index d2ba1f3dd7e..7fff68a635b 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -1197,8 +1197,8 @@ lookup_symbol_in_language (const char *name, const struct block *block, char *demangled_name = NULL; const char *modified_name = NULL; const char *mangled_name = NULL; - int needtofreename = 0; struct symbol *returnval; + struct cleanup *cleanup = make_cleanup (null_cleanup, 0); modified_name = name; @@ -1211,7 +1211,7 @@ lookup_symbol_in_language (const char *name, const struct block *block, { mangled_name = name; modified_name = demangled_name; - needtofreename = 1; + make_cleanup (xfree, demangled_name); } } else if (lang == language_java) @@ -1222,7 +1222,7 @@ lookup_symbol_in_language (const char *name, const struct block *block, { mangled_name = name; modified_name = demangled_name; - needtofreename = 1; + make_cleanup (xfree, demangled_name); } } @@ -1241,8 +1241,7 @@ lookup_symbol_in_language (const char *name, const struct block *block, returnval = lookup_symbol_aux (modified_name, mangled_name, block, domain, lang, is_a_field_of_this); - if (needtofreename) - xfree (demangled_name); + do_cleanups (cleanup); return returnval; } -- 2.30.2