espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-26 05:47:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

gdb/tui: Use cleanups to free string copies.

Browse Source 
In parse_scrolling_args it is possible for a string copy to leak if an
error occurs.  Switching to using a cleanup fixes this leak.

In tui_set_win_height the string can't be leaked, but switching to using
a cleanup guards against the possibility that a leak could be introduced
in the future (by adding an error somewhere in the call stack).

gdb/ChangeLog:

	* tui/tui-win.c (tui_set_win_height): Use a cleanup to free the
	string copy.
	(parse_scrolling_args): Likewise.
This commit is contained in:
Andrew Burgess
2015-07-06 18:16:24 +01:00
parent 150375dc7a
commit c101f28fea
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
2015-07-10 Andrew Burgess <andrew.burgess@embecosm.com>
* tui/tui-win.c (tui_set_win_height): Use a cleanup to free the
string copy.
(parse_scrolling_args): Likewise.
2015-07-10 Andrew Burgess <andrew.burgess@embecosm.com> 2015-07-10 Andrew Burgess <andrew.burgess@embecosm.com>
* tui/tui-win.c (focus_completer): Don't duplicate the tui window * tui/tui-win.c (focus_completer): Don't duplicate the tui window

9
gdb/tui/tui-win.c
View File

@ -1141,7 +1141,9 @@ tui_set_win_height (char *arg, int from_tty)
char *wname = (char *) NULL; char *wname = (char *) NULL;
int new_height, i; int new_height, i;
struct tui_win_info *win_info; struct tui_win_info *win_info;
struct cleanup *old_chain;
old_chain = make_cleanup (xfree, buf);
wname = buf_ptr; wname = buf_ptr;
buf_ptr = strchr (buf_ptr, ' '); buf_ptr = strchr (buf_ptr, ' ');
if (buf_ptr != (char *) NULL) if (buf_ptr != (char *) NULL)
@ -1204,8 +1206,7 @@ The window name specified must be valid and visible.\n"));
else else
printf_filtered (WIN_HEIGHT_USAGE); printf_filtered (WIN_HEIGHT_USAGE);
if (buf != (char *) NULL) do_cleanups (old_chain);
xfree (buf);
} }
else else
printf_filtered (WIN_HEIGHT_USAGE); printf_filtered (WIN_HEIGHT_USAGE);
@ -1636,9 +1637,11 @@ parse_scrolling_args (char *arg,
if (arg != (char *) NULL) if (arg != (char *) NULL)
{ {
char *buf, *buf_ptr; char *buf, *buf_ptr;
struct cleanup *old_chain;
/* Process the number of lines to scroll. */ /* Process the number of lines to scroll. */
buf = buf_ptr = xstrdup (arg); buf = buf_ptr = xstrdup (arg);
old_chain = make_cleanup (xfree, buf);
if (isdigit (*buf_ptr)) if (isdigit (*buf_ptr))
{ {
char *num_str; char *num_str;
@ -1686,6 +1689,6 @@ The window name specified must be valid and visible.\n"));
else if (*win_to_scroll == TUI_CMD_WIN) else if (*win_to_scroll == TUI_CMD_WIN)
*win_to_scroll = (tui_source_windows ())->list[0]; *win_to_scroll = (tui_source_windows ())->list[0];
} }
xfree (buf); do_cleanups (old_chain);
} }
} }