circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 22:43:58 +00:00
Code Issues Projects Releases Wiki Activity

Memory could be leaked if a second prompt or message appeared while another was

Browse Source 
still present, so add a separate prompt free callback and make the _clear
function responsible for calling it if necessary (rather than the individual
This commit is contained in:
Nicholas Marriott
2009-07-17 09:26:21 +00:00
parent ac55534055
commit 441c118b63
6 changed files with 67 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cmd-command-prompt.c
View File

@ -1,4 +1,4 @@
/* $Id: cmd-command-prompt.c,v 1.18 2009-07-15 17:50:11 nicm Exp $ */
/* $Id: cmd-command-prompt.c,v 1.19 2009-07-17 09:26:21 nicm Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@ -31,6 +31,7 @@ void cmd_command_prompt_init(struct cmd *, int);
int cmd_command_prompt_exec(struct cmd *, struct cmd_ctx *);
int cmd_command_prompt_callback(void *, const char *);
void cmd_command_prompt_free(void *);
const struct cmd_entry cmd_command_prompt_entry = {
"command-prompt", NULL,
@ -96,7 +97,8 @@ cmd_command_prompt_exec(struct cmd *self, struct cmd_ctx *ctx)
cdata->template = NULL;
hdr = xstrdup(":");
}
status_prompt_set(c, hdr, cmd_command_prompt_callback, cdata, 0);
status_prompt_set(c, hdr,
cmd_command_prompt_callback, cmd_command_prompt_free, cdata, 0);
xfree(hdr);
return (0);
@ -112,10 +114,8 @@ cmd_command_prompt_callback(void *data, const char *s)
char *cause, *ptr, *buf, ch;
size_t len, slen;
if (s == NULL) {
xfree(cdata);
if (s == NULL)
return (0);
}
slen = strlen(s);
len = 0;
@ -139,12 +139,10 @@ cmd_command_prompt_callback(void *data, const char *s)
break;
}
}
xfree(cdata->template);
buf[len] = '\0';
s = buf;
}
xfree(cdata);
if (cmd_string_parse(s, &cmdlist, &cause) != 0) {
if (cause == NULL)
@ -172,7 +170,17 @@ cmd_command_prompt_callback(void *data, const char *s)
cmd_list_exec(cmdlist, &ctx);
cmd_list_free(cmdlist);
if (c->prompt_callback != (void *) &cmd_command_prompt_callback)
if (c->prompt_callbackfn != (void *) &cmd_command_prompt_callback)
return (1);
return (0);
}
void
cmd_command_prompt_free(void *data)
{
struct cmd_command_prompt_data *cdata = data;
if (cdata->template != NULL)
xfree(cdata->template);
xfree(cdata);
}