From: Lasse Collin <lasse.collin@tukaani.org>
Date: Mon, 21 Oct 2024 15:41:41 +0000 (+0300)
Subject: tuklib_mbstr_width: Use stricter return value checking
X-Git-Tag: v5.7.1alpha~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c16105936320e4095dbe84fa9a33a4a6d46a597;p=thirdparty%2Fxz.git

tuklib_mbstr_width: Use stricter return value checking

This should make no difference in practice (at least if mbrtowc()
isn't broken).
---

diff --git a/src/common/tuklib_mbstr_width.c b/src/common/tuklib_mbstr_width.c
index 3c63dd1a..e7052235 100644
--- a/src/common/tuklib_mbstr_width.c
+++ b/src/common/tuklib_mbstr_width.c
@@ -41,7 +41,7 @@ tuklib_mbstr_width(const char *str, size_t *bytes)
 	while (i < len) {
 		wchar_t wc;
 		const size_t ret = mbrtowc(&wc, str + i, len - i, &state);
-		if (ret < 1 || ret > len)
+		if (ret < 1 || ret > len - i)
 			return (size_t)-1;
 
 		i += ret;