circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-16 17:39:09 +00:00
Code Issues Projects Releases Wiki Activity

Take a reference to prevent cmdq being freed during the command. Can

Browse Source 
happen to cfg_cmd_q (possibly others) when source-file recurses into
cmdq_continue. Fixes bug reported by Ismail Donmez and Theo Buehler.
This commit is contained in:
nicm 2015-02-12 09:56:19 +00:00
parent 9ae2284726
commit 4d05d88304
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd-queue.c
View File

@ -163,6 +163,7 @@ cmdq_continue(struct cmd_q *cmdq)
int empty, flags; int empty, flags;
char s[1024]; char s[1024];
cmdq->references++;
notify_disable(); notify_disable();
empty = TAILQ_EMPTY(&cmdq->queue); empty = TAILQ_EMPTY(&cmdq->queue);
@ -220,11 +221,13 @@ empty:
if (cmdq->client_exit > 0) if (cmdq->client_exit > 0)
cmdq->client->flags |= CLIENT_EXIT; cmdq->client->flags |= CLIENT_EXIT;
if (cmdq->emptyfn != NULL) if (cmdq->emptyfn != NULL)
cmdq->emptyfn(cmdq); /* may free cmdq */ cmdq->emptyfn(cmdq);
empty = 1; empty = 1;
out: out:
notify_enable(); notify_enable();
cmdq_free(cmdq);
return (empty); return (empty);
} }