From: Joel Brobecker <brobecker@gnat.com>
Date: Tue, 21 May 2013 05:41:31 +0000 (+0000)
Subject: [Ada] Fix cleanup leak in ada-lang.c:old_renaming_is_invisible
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1509e5737f8b0d499117aefbd68ca8e9548f701f;p=binutils-gdb.git

[Ada] Fix cleanup leak in ada-lang.c:old_renaming_is_invisible

gdb/ChangeLog:

	* ada-lang.c (old_renaming_is_invisible): Fix cleanup leak.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 19a4cd6d2c8..c48f7e7d50b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-21  Joel Brobecker  <brobecker@adacore.com>
+
+	* ada-lang.c (old_renaming_is_invisible): Fix cleanup leak.
+
 2013-05-21  Hui Zhu  <hui@codesourcery.com>
 
 	* breakpoint.c (dprintf_breakpoint_ops): Remove its static.
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index fa6db0f7411..b6d5e0b71a5 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -4726,17 +4726,20 @@ static int
 old_renaming_is_invisible (const struct symbol *sym, const char *function_name)
 {
   char *scope;
+  struct cleanup *old_chain;
 
   if (SYMBOL_CLASS (sym) != LOC_TYPEDEF)
     return 0;
 
   scope = xget_renaming_scope (SYMBOL_TYPE (sym));
-
-  make_cleanup (xfree, scope);
+  old_chain = make_cleanup (xfree, scope);
 
   /* If the rename has been defined in a package, then it is visible.  */
   if (is_package_name (scope))
-    return 0;
+    {
+      do_cleanups (old_chain);
+      return 0;
+    }
 
   /* Check that the rename is in the current function scope by checking
      that its name starts with SCOPE.  */
@@ -4748,7 +4751,12 @@ old_renaming_is_invisible (const struct symbol *sym, const char *function_name)
   if (strncmp (function_name, "_ada_", 5) == 0)
     function_name += 5;
 
-  return (strncmp (function_name, scope, strlen (scope)) != 0);
+  {
+    int is_invisible = strncmp (function_name, scope, strlen (scope)) != 0;
+
+    do_cleanups (old_chain);
+    return is_invisible;
+  }
 }
 
 /* Remove entries from SYMS that corresponds to a renaming entity that