From d0efde07da335310b2e9da3bb9a690c2123fbc5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= <mat@brain-dump.org>
Date: Sun, 11 Mar 2018 22:02:30 +0100
Subject: Reset parsing state after mbrtowc(3) failure

The standard says "if an encoding error occurs ...  the conversion state
is unspecified".
---
 text-util.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'text-util.c')

diff --git a/text-util.c b/text-util.c
index 4936d92..3cc994e 100644
--- a/text-util.c
+++ b/text-util.c
@@ -63,6 +63,7 @@ int text_char_count(const char *data, size_t len) {
 		wchar_t wc;
 		size_t wclen = mbrtowc(&wc, data, len, &ps);
 		if (wclen == (size_t)-1 && errno == EILSEQ) {
+			ps = (mbstate_t){0};
 			count++;
 			while (!ISUTF8(*data))
 				data++, len--;
@@ -93,6 +94,7 @@ int text_string_width(const char *data, size_t len) {
 		wchar_t wc;
 		size_t wclen = mbrtowc(&wc, s, len, &ps);
 		if (wclen == (size_t)-1 && errno == EILSEQ) {
+			ps = (mbstate_t){0};
 			/* assume a replacement symbol will be displayed */
 			width++;
 			wclen = 1;
-- 
cgit v1.2.3