diff options
| author |   nicm <nicm@openbsd.org> | 2019-04-30 06:19:51 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2019-04-30 06:19:51 +0000 |
| commit | 0a4d943da87449297af308d06b850aeaec9f6cb8 (patch) | |
| tree | d079ac51a876b3cbd96d6a078644be3853956a27 | |
| parent | Convert a linux specific test for master in currently disabled code. (diff) | |
| download | wireguard-openbsd-0a4d943da87449297af308d06b850aeaec9f6cb8.tar.xz wireguard-openbsd-0a4d943da87449297af308d06b850aeaec9f6cb8.zip | |
Fix memory leak in window tree search, from Amos Bird.
| -rw-r--r-- | usr.bin/tmux/window-tree.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/usr.bin/tmux/window-tree.c b/usr.bin/tmux/window-tree.c index 4d1f603dfbc..daae6dab492 100644 --- a/usr.bin/tmux/window-tree.c +++ b/usr.bin/tmux/window-tree.c @@ -1,4 +1,4 @@ -/* $OpenBSD: window-tree.c,v 1.36 2019/04/17 14:37:48 nicm Exp $ */ +/* $OpenBSD: window-tree.c,v 1.37 2019/04/30 06:19:51 nicm Exp $ */ /* * Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -785,7 +785,8 @@ window_tree_search(__unused void *modedata, void *itemdata, const char *ss) struct session *s; struct winlink *wl; struct window_pane *wp; - const char *cmd; + char *cmd; + int retval; window_tree_pull_item(item, &s, &wl, &wp); @@ -806,7 +807,9 @@ window_tree_search(__unused void *modedata, void *itemdata, const char *ss) cmd = get_proc_name(wp->fd, wp->tty); if (cmd == NULL || *cmd == '\0') return (0); - return (strstr(cmd, ss) != NULL); + retval = (strstr(cmd, ss) != NULL); + free(cmd); + return retval; } return (0); } |