Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2015-10-07 12:01:21 +01:00
commit 5b13dafbab

View File

@ -196,6 +196,7 @@ cmd_capture_pane_exec(struct cmd *self, struct cmd_q *cmdq)
if (c == NULL || if (c == NULL ||
(c->session != NULL && !(c->flags & CLIENT_CONTROL))) { (c->session != NULL && !(c->flags & CLIENT_CONTROL))) {
cmdq_error(cmdq, "can't write to stdout"); cmdq_error(cmdq, "can't write to stdout");
free(buf);
return (CMD_RETURN_ERROR); return (CMD_RETURN_ERROR);
} }
evbuffer_add(c->stdout_data, buf, len); evbuffer_add(c->stdout_data, buf, len);
@ -210,11 +211,12 @@ cmd_capture_pane_exec(struct cmd *self, struct cmd_q *cmdq)
if (paste_set(buf, len, bufname, &cause) != 0) { if (paste_set(buf, len, bufname, &cause) != 0) {
cmdq_error(cmdq, "%s", cause); cmdq_error(cmdq, "%s", cause);
free(buf);
free(cause); free(cause);
free(buf);
return (CMD_RETURN_ERROR); return (CMD_RETURN_ERROR);
} }
} }
free(buf);
return (CMD_RETURN_NORMAL); return (CMD_RETURN_NORMAL);
} }