Re: Checked in: [RFA] completer test [was Re: [RFC] Cleanup for make_source_files_completion_list]

Joel Brobecker
2013-05-21T05:44:35Z

[-- Attachment #1: Type: text/plain, Size: 279 bytes --]

> Cool, thanks! Attached is what I checked in, after a round of testing on
> x86_64-linux.
>
> gdb/ChangeLog:
>
> * ada-lang.c (old_renaming_is_invisible): Fix cleanup leak.
>
> Thanks again for pointing this cleanup leak out.

Really attached, this time...

--
Joel

[-- Attachment #2: 0001-Ada-Fix-cleanup-leak-in-ada-lang.c-old_renaming_is_i.patch --]
[-- Type: text/x-diff, Size: 2052 bytes --]

From aea9d783272e628dea85555ebebc0f3891fd5f77 Mon Sep 17 00:00:00 2001
From: Joel Brobecker <brobecker@adacore.com>
Date: Tue, 21 May 2013 09:40:01 +0400
Subject: [PATCH] [Ada] Fix cleanup leak in
ada-lang.c:old_renaming_is_invisible

gdb/ChangeLog:

* ada-lang.c (old_renaming_is_invisible): Fix cleanup leak.
---
gdb/ChangeLog | 4 ++++
gdb/ada-lang.c | 16 ++++++++++++----
2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 19a4cd6..c48f7e7 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 fa6db0f..b6d5e0b 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
--
1.7.10.4