summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2019-03-20 07:24:03 +0000
committernicm <nicm@openbsd.org>2019-03-20 07:24:03 +0000
commit38c9d6a44f256cb46cbc0cc4cfba25b8f23cd9a4 (patch)
treeb31216cc18d1c36c79bf9addde62a65e6cce1a42
parentBit more logging to show drawing errors. (diff)
downloadwireguard-openbsd-38c9d6a44f256cb46cbc0cc4cfba25b8f23cd9a4.tar.xz
wireguard-openbsd-38c9d6a44f256cb46cbc0cc4cfba25b8f23cd9a4.zip
Ignore invalid styles rather than throwing away the whole format, this
matches what we used to do.
-rw-r--r--usr.bin/tmux/format-draw.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/tmux/format-draw.c b/usr.bin/tmux/format-draw.c
index ab275cd940b..51df9746a49 100644
--- a/usr.bin/tmux/format-draw.c
+++ b/usr.bin/tmux/format-draw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: format-draw.c,v 1.3 2019/03/20 07:13:02 nicm Exp $ */
+/* $OpenBSD: format-draw.c,v 1.4 2019/03/20 07:24:03 nicm Exp $ */
/*
* Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -583,7 +583,8 @@ format_draw(struct screen_write_ctx *octx, const struct grid_cell *base,
if (style_parse(&sy, base, tmp) != 0) {
log_debug("invalid style '%s'", tmp);
free(tmp);
- return;
+ cp = end + 1;
+ continue;
}
log_debug("style '%s' -> '%s'", tmp, style_tostring(&sy));
free(tmp);