From 822ee4e0a64cd27c4668aed53f1284b257612dcb Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 2 Jun 2020 11:29:00 +0000
Subject: [PATCH] Fail rather than fatal on UTF-8 width 0.

---
 utf8.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/utf8.c b/utf8.c
index 2a92003f..893cb5ee 100644
--- a/utf8.c
+++ b/utf8.c
@@ -135,6 +135,8 @@ utf8_from_data(const struct utf8_data *ud, utf8_char *uc)
 	union utf8_map	 m = { .uc = 0 };
 	u_int		 offset;
 
+	if (ud->width == 0)
+		goto fail;
 	if (ud->width != 1 && ud->width != 2)
 		fatalx("invalid UTF-8 width");
 	if (ud->size == 0)