Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2016-09-28 18:01:11 +01:00
commit c41916ee16
2 changed files with 2 additions and 2 deletions

View File

@ -80,7 +80,7 @@ cmdq_print(struct cmd_q *cmdq, const char *fmt, ...)
/* nothing */;
else if (c->session == NULL || (c->flags & CLIENT_CONTROL)) {
if (~c->flags & CLIENT_UTF8) {
vasprintf(&tmp, fmt, ap);
xvasprintf(&tmp, fmt, ap);
msg = utf8_sanitize(tmp);
free(tmp);
evbuffer_add(c->stdout_data, msg, strlen(msg));

View File

@ -961,7 +961,7 @@ input_reply(struct input_ctx *ictx, const char *fmt, ...)
char *reply;
va_start(ap, fmt);
vasprintf(&reply, fmt, ap);
xvasprintf(&reply, fmt, ap);
va_end(ap);
bufferevent_write(ictx->wp->event, reply, strlen(reply));