From 36eb16ce7db2db71b510964a2e453e6b349b03f0 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 8 Jan 2020 14:40:52 +0000
Subject: [PATCH] Do not hang in format_trim_* on invalid UTF-8 characters.

---
 format-draw.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/format-draw.c b/format-draw.c
index 6cced9fd..bb16e0dd 100644
--- a/format-draw.c
+++ b/format-draw.c
@@ -849,8 +849,10 @@ format_trim_left(const char *expanded, u_int limit)
 					out += ud.size;
 				}
 				width += ud.width;
-			} else
+			} else {
 				cp -= ud.have;
+				cp++;
+			}
 		} else if (*cp > 0x1f && *cp < 0x7f) {
 			if (width + 1 <= limit)
 				*out++ = *cp;
@@ -896,8 +898,10 @@ format_trim_right(const char *expanded, u_int limit)
 					out += ud.size;
 				}
 				width += ud.width;
-			} else
+			} else {
 				cp -= ud.have;
+				cp++;
+			}
 		} else if (*cp > 0x1f && *cp < 0x7f) {
 			if (width >= skip)
 				*out++ = *cp;