circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-04-21 20:08:48 +00:00
Code Issues Projects Releases Wiki Activity

The free callback could end up being fired before the done callback

Browse Source 
(happens on Cygwin), so use a reference count instead of a single
flag. SF bug 188 reported by "iceboy".
This commit is contained in:
nicm 2015-04-21 21:31:02 +00:00
parent 0e7219d437
commit d16b640fe8
1 changed files with 8 additions and 7 deletions

15
cmd-if-shell.c
View File

@ -51,7 +51,7 @@ struct cmd_if_shell_data {
struct mouse_event mouse; struct mouse_event mouse;
int bflag; int bflag;
int started; int references;
}; };
enum cmd_retval enum cmd_retval
@ -113,11 +113,11 @@ cmd_if_shell_exec(struct cmd *self, struct cmd_q *cmdq)
cdata->bflag = args_has(args, 'b'); cdata->bflag = args_has(args, 'b');
cdata->started = 0;
cdata->cmdq = cmdq; cdata->cmdq = cmdq;
memcpy(&cdata->mouse, &cmdq->item->mouse, sizeof cdata->mouse); memcpy(&cdata->mouse, &cmdq->item->mouse, sizeof cdata->mouse);
cmdq->references++; cmdq->references++;
cdata->references = 1;
job_run(shellcmd, s, cmd_if_shell_callback, cmd_if_shell_free, cdata); job_run(shellcmd, s, cmd_if_shell_callback, cmd_if_shell_free, cdata);
free(shellcmd); free(shellcmd);
@ -152,12 +152,11 @@ cmd_if_shell_callback(struct job *job)
return; return;
} }
cdata->started = 1;
cmdq1 = cmdq_new(cmdq->client); cmdq1 = cmdq_new(cmdq->client);
cmdq1->emptyfn = cmd_if_shell_done; cmdq1->emptyfn = cmd_if_shell_done;
cmdq1->data = cdata; cmdq1->data = cdata;
cdata->references++;
cmdq_run(cmdq1, cmdlist, &cdata->mouse); cmdq_run(cmdq1, cmdlist, &cdata->mouse);
cmd_list_free(cmdlist); cmd_list_free(cmdlist);
} }
@ -170,12 +169,14 @@ cmd_if_shell_done(struct cmd_q *cmdq1)
if (cmdq1->client_exit >= 0) if (cmdq1->client_exit >= 0)
cmdq->client_exit = cmdq1->client_exit; cmdq->client_exit = cmdq1->client_exit;
cmdq_free(cmdq1);
if (--cdata->references != 0)
return;
if (!cmdq_free(cmdq) && !cdata->bflag) if (!cmdq_free(cmdq) && !cdata->bflag)
cmdq_continue(cmdq); cmdq_continue(cmdq);
cmdq_free(cmdq1);
free(cdata->cmd_else); free(cdata->cmd_else);
free(cdata->cmd_if); free(cdata->cmd_if);
free(cdata); free(cdata);
@ -187,7 +188,7 @@ cmd_if_shell_free(void *data)
struct cmd_if_shell_data *cdata = data; struct cmd_if_shell_data *cdata = data;
struct cmd_q *cmdq = cdata->cmdq; struct cmd_q *cmdq = cdata->cmdq;
if (cdata->started) if (--cdata->references != 0)
return; return;
if (!cmdq_free(cmdq) && !cdata->bflag) if (!cmdq_free(cmdq) && !cdata->bflag)