diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-08-01 23:35:03 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-08-01 23:35:03 +0100 |
| commit | 1c271852fc7464ecdff1697a66a8bc0eac44e90d (patch) | |
| tree | 588653a47daa3d5dd4e26f1689f5cfd49e08cb93 /cmd-queue.c | |
| parent | 7ea560261c72cd8e8453e7ea0e4f3922a2bdfeb3 (diff) | |
| download | rtmux-1c271852fc7464ecdff1697a66a8bc0eac44e90d.tar.gz rtmux-1c271852fc7464ecdff1697a66a8bc0eac44e90d.tar.bz2 rtmux-1c271852fc7464ecdff1697a66a8bc0eac44e90d.zip | |
Pass flags into cmdq_guard as an argument since sometimes cmdq->cmd can be
NULL. Avoids crash when a command in a command client can't be parsed.
Diffstat (limited to 'cmd-queue.c')
| -rw-r--r-- | cmd-queue.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cmd-queue.c b/cmd-queue.c index 243f73dd..38a88d23 100644 --- a/cmd-queue.c +++ b/cmd-queue.c @@ -154,18 +154,15 @@ cmdq_error(struct cmd_q *cmdq, const char *fmt, ...) /* Print a guard line. */ int -cmdq_guard(struct cmd_q *cmdq, const char *guard) +cmdq_guard(struct cmd_q *cmdq, const char *guard, int flags) { struct client *c = cmdq->client; - int flags; if (c == NULL) return 0; if (!(c->flags & CLIENT_CONTROL)) return 0; - flags = !!(cmdq->cmd->flags & CMD_CONTROL); - evbuffer_add_printf(c->stdout_data, "%%%s %ld %u %d\n", guard, (long) cmdq->time, cmdq->number, flags); server_push_stdout(c); @@ -202,7 +199,7 @@ cmdq_continue(struct cmd_q *cmdq) { struct cmd_q_item *next; enum cmd_retval retval; - int empty, guard; + int empty, guard, flags; char s[1024]; notify_disable(); @@ -228,13 +225,16 @@ cmdq_continue(struct cmd_q *cmdq) cmdq->time = time(NULL); cmdq->number++; - guard = cmdq_guard(cmdq, "begin"); + flags = !!(cmdq->cmd->flags & CMD_CONTROL); + guard = cmdq_guard(cmdq, "begin", flags); + retval = cmdq->cmd->entry->exec(cmdq->cmd, cmdq); + if (guard) { if (retval == CMD_RETURN_ERROR) - cmdq_guard(cmdq, "error"); + cmdq_guard(cmdq, "error", flags); else - cmdq_guard(cmdq, "end"); + cmdq_guard(cmdq, "end", flags); } if (retval == CMD_RETURN_ERROR) |