Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
* RFA: fix memory leak in "source" command
@ 2008-11-10 19:45 Tom Tromey
  2008-11-10 20:50 ` Pedro Alves
  0 siblings, 1 reply; 2+ messages in thread
From: Tom Tromey @ 2008-11-10 19:45 UTC (permalink / raw)
  To: gdb-patches

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);


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: RFA: fix memory leak in "source" command
  2008-11-10 19:45 RFA: fix memory leak in "source" command Tom Tromey
@ 2008-11-10 20:50 ` Pedro Alves
  0 siblings, 0 replies; 2+ messages in thread
From: Pedro Alves @ 2008-11-10 20:50 UTC (permalink / raw)
  To: gdb-patches, Tom Tromey

On Monday 10 November 2008 19:37:09, Tom Tromey wrote:
> 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?
> 

Ok,

:REVIEWMAIL:

-- 
Pedro Alves


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-11-10 20:33 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-11-10 19:45 RFA: fix memory leak in "source" command Tom Tromey
2008-11-10 20:50 ` Pedro Alves

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox