summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2016-09-28 18:01:11 +0100
committerThomas Adam <thomas@xteddy.org>2016-09-28 18:01:11 +0100
commitc41916ee16cf1398797f209271bd469de4682924 (patch)
tree00b3bf6cfd1ce7c60e18225c0a7c7222cf59f475
parent27591570c4a6d1142e0403e209106326a45b859e (diff)
parentbb5798aa0e9e1c4c992afab4939fc0ce7c1479c1 (diff)
Merge branch 'obsd-master'
-rw-r--r--cmd-queue.c2
-rw-r--r--input.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd-queue.c b/cmd-queue.c
index c35d0c62..e9073c92 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -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));
diff --git a/input.c b/input.c
index 289a25c8..5c11a61d 100644
--- a/input.c
+++ b/input.c
@@ -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));