This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
RFA: fix memory leak in "source" command
- From: Tom Tromey <tromey at redhat dot com>
- To: gdb-patches at sourceware dot org
- Date: Mon, 10 Nov 2008 12:37:09 -0700
- Subject: RFA: fix memory leak in "source" command
- Reply-to: Tom Tromey <tromey at redhat dot com>
Valgrind pointed out that the "source" command leaks full_pathname.
The fix is to add a cleanup for it. This patch also makes sure to run
the cleanups on early return from the function.
Built and regested on x86-64 (compile farm).
Ok?
Tom
:ADDPATCH cli:
2008-11-10 Tom Tromey <tromey@redhat.com>
* cli/cli-cmds.c (source_script): Clean up full_pathname. Run
cleanups on early return.
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index d9d2c56..21a64a0 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -450,6 +450,7 @@ source_script (char *file, int from_tty)
files. Put the full location in 'full_pathname'. */
fd = openp (source_path, OPF_TRY_CWD_FIRST,
file, O_RDONLY, 0, &full_pathname);
+ make_cleanup (xfree, full_pathname);
/* Use the full path name, if it is found. */
if (full_pathname != NULL && fd != -1)
@@ -462,7 +463,10 @@ source_script (char *file, int from_tty)
if (from_tty)
perror_with_name (file);
else
- return;
+ {
+ do_cleanups (old_cleanups);
+ return;
+ }
}
stream = fdopen (fd, FOPEN_RT);