diff mbox

[4/4] gdb: Add cleanup to avoid memory leak on error.

Message ID deb6b2ee05573ce1309174d61f7f37650b108f45.1432163460.git.andrew.burgess@embecosm.com
State Committed
Headers show

Commit Message

Andrew Burgess May 20, 2015, 11:17 p.m. UTC
Use cleanup to avoid leaking memory if an error occurs during tui
start up.

gdb/ChangeLog:

	* tui/tui-layout.c (tui_set_layout_for_display_command): Ensure
	buf_ptr is freed.
---
 gdb/ChangeLog        | 5 +++++
 gdb/tui/tui-layout.c | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8ea1a5e..78e5654 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@ 
 2015-05-20  Andrew Burgess  <andrew.burgess@embecosm.com>
 
+	* tui/tui-layout.c (tui_set_layout_for_display_command): Ensure
+	buf_ptr is freed.
+
+2015-05-20  Andrew Burgess  <andrew.burgess@embecosm.com>
+
 	* tui/tui-layout.c (tui_layout_command): Move call to tui_enable
 	into ...
 	(tui_set_layout_for_display_command): ...here, before calling
diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c
index 2e950f7..0614b2c 100644
--- a/gdb/tui/tui-layout.c
+++ b/gdb/tui/tui-layout.c
@@ -426,10 +426,12 @@  tui_set_layout_for_display_command (const char *layout_name)
       char *buf_ptr;
       enum tui_layout_type new_layout = UNDEFINED_LAYOUT;
       enum tui_layout_type cur_layout = tui_current_layout ();
+      struct cleanup *old_chain;
 
       buf_ptr = (char *) xstrdup (layout_name);
       for (i = 0; (i < strlen (layout_name)); i++)
 	buf_ptr[i] = toupper (buf_ptr[i]);
+      old_chain = make_cleanup (xfree, buf_ptr);
 
       /* First check for ambiguous input.  */
       if (strlen (buf_ptr) <= 1 && *buf_ptr == 'S')
@@ -467,7 +469,7 @@  tui_set_layout_for_display_command (const char *layout_name)
 	      tui_set_layout (new_layout);
 	    }
 	}
-      xfree (buf_ptr);
+      do_cleanups (old_chain);
     }
   else
     status = TUI_FAILURE;