circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-03-06 15:55:33 +00:00
Code Issues Projects Releases Wiki Activity

Fix memory leaks, reported by Huihui Huang in GitHub issue 4872.

Browse Source
This commit is contained in:
nicm
2026-02-23 08:45:27 +00:00
parent 23ad10c849
commit 3094ca1da5
2 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
cmd-display-menu.c
View File

@@ -394,7 +394,7 @@ cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item)
const char *style = args_get(args, 's'); const char *style = args_get(args, 's');
const char *border_style = args_get(args, 'S'); const char *border_style = args_get(args, 'S');
char *cwd = NULL, *cause = NULL, **argv = NULL; char *cwd = NULL, *cause = NULL, **argv = NULL;
char *title; char *title = NULL;
int modify = popup_present(tc); int modify = popup_present(tc);
int flags = -1, argc = 0; int flags = -1, argc = 0;
enum box_lines lines = BOX_LINES_DEFAULT; enum box_lines lines = BOX_LINES_DEFAULT;
@@ -418,8 +418,7 @@ cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item)
&cause); &cause);
if (cause != NULL) { if (cause != NULL) {
cmdq_error(item, "height %s", cause); cmdq_error(item, "height %s", cause);
free(cause); goto fail;
return (CMD_RETURN_ERROR);
} }
} }
@@ -429,8 +428,7 @@ cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item)
&cause); &cause);
if (cause != NULL) { if (cause != NULL) {
cmdq_error(item, "width %s", cause); cmdq_error(item, "width %s", cause);
free(cause); goto fail;
return (CMD_RETURN_ERROR);
} }
} }
@@ -439,7 +437,7 @@ cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item)
if (h > tty->sy) if (h > tty->sy)
h = tty->sy; h = tty->sy;
if (!cmd_display_menu_get_pos(tc, item, args, &px, &py, w, h)) if (!cmd_display_menu_get_pos(tc, item, args, &px, &py, w, h))
return (CMD_RETURN_NORMAL); goto out;
value = args_get(args, 'd'); value = args_get(args, 'd');
if (value != NULL) if (value != NULL)
@@ -479,8 +477,7 @@ cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item)
&cause); &cause);
if (cause != NULL) { if (cause != NULL) {
cmdq_error(item, "popup-border-lines %s", cause); cmdq_error(item, "popup-border-lines %s", cause);
free(cause); goto fail;
return (CMD_RETURN_ERROR);
} }
} }
@@ -508,22 +505,29 @@ cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item)
if (modify) { if (modify) {
popup_modify(tc, title, style, border_style, lines, flags); popup_modify(tc, title, style, border_style, lines, flags);
free(title); goto out;
return (CMD_RETURN_NORMAL);
} }
if (popup_display(flags, lines, item, px, py, w, h, env, shellcmd, argc, if (popup_display(flags, lines, item, px, py, w, h, env, shellcmd, argc,
argv, cwd, title, tc, s, style, border_style, NULL, NULL) != 0) { argv, cwd, title, tc, s, style, border_style, NULL, NULL) != 0)
cmd_free_argv(argc, argv); goto out;
if (env != NULL) environ_free(env);
environ_free(env);
free(cwd);
free(title);
return (CMD_RETURN_NORMAL);
}
if (env != NULL)
environ_free(env);
free(cwd); free(cwd);
free(title); free(title);
cmd_free_argv(argc, argv); cmd_free_argv(argc, argv);
return (CMD_RETURN_WAIT); return (CMD_RETURN_WAIT);
out:
cmd_free_argv(argc, argv);
environ_free(env);
free(cwd);
free(title);
return (CMD_RETURN_NORMAL);
fail:
free(cause);
cmd_free_argv(argc, argv);
environ_free(env);
free(cwd);
free(title);
return (CMD_RETURN_ERROR);
} }

3
environ.c
View File

@@ -57,6 +57,9 @@ environ_free(struct environ *env)
{ {
struct environ_entry *envent, *envent1; struct environ_entry *envent, *envent1;
if (env == NULL)
return;
RB_FOREACH_SAFE(envent, environ, env, envent1) { RB_FOREACH_SAFE(envent, environ, env, envent1) {
RB_REMOVE(environ, env, envent); RB_REMOVE(environ, env, envent);
free(envent->name); free(envent->name);