Merge branch 'master' into feature/api-mpfr

1 files changed, 2 insertions, 1 deletions

diff --git a/builtin.c b/builtin.c
index b60d8b42..b3eda933 100644
--- a/builtin.c
+++ b/builtin.c
@@ -4154,12 +4154,13 @@ mbc_char_count(const char *ptr, size_t numbytes)
 	if (mb_len <= 0)
 		return numbytes;	/* no valid m.b. char */
 
-	for (; numbytes > 0; numbytes--) {
+	while (numbytes > 0) {
 		mb_len = mbrlen(ptr, numbytes, &cur_state);
 		if (mb_len <= 0)
 			break;
 		sum++;
 		ptr += mb_len;
+		numbytes -= mb_len;
 	}
 
 	return sum;