From dd26f81c56b9eeeba267d9cdf50aa3b20d3b6d8a Mon Sep 17 00:00:00 2001
From: Michael Lotz <mmlr@mlotz.ch>
Date: Tue, 6 Dec 2011 19:09:56 +0100
Subject: [PATCH] Add an UTF8NextCharLen() version that takes a string length.

This one works with non-terminated strings that we may need to handle.
It also validates that the sequence is valid UTF-8 so it results in
the same behaviour as the version that is used when converting to
codes (syncing the enumeration and drawing behaviour).
---
 headers/private/interface/utf8_functions.h | 47 ++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/headers/private/interface/utf8_functions.h b/headers/private/interface/utf8_functions.h
index 95abc72555..f04e59ca22 100644
--- a/headers/private/interface/utf8_functions.h
+++ b/headers/private/interface/utf8_functions.h
@@ -39,6 +39,53 @@ UTF8NextCharLen(const char *text)
 }
 
 
+static inline uint32
+UTF8NextCharLen(const char *bytes, size_t length)
+{
+	if (bytes == NULL || length == 0 || bytes[0] == 0)
+		return 0;
+
+	if ((bytes[0] & 0x80) == 0) {
+		// A single ASCII char - or so...
+		return 1;
+	}
+
+	if (IsInsideGlyph(bytes[0])) {
+		// Not a proper multibyte start.
+		return 0;
+	}
+
+	// We already know that we have the upper two bits set due to the above
+	// two checks.
+	uint8 mask = 0x20;
+	size_t bytesExpected = 2;
+	while ((bytes[0] & mask) != 0) {
+		if (mask == 0x02) {
+			// Seven byte char - invalid.
+			return 0;
+		}
+
+		bytesExpected++;
+		mask >>= 1;
+	}
+
+	// There would need to be more bytes to satisfy the char.
+	if (bytesExpected > length)
+		return 0;
+
+	// We already know the first byte is fine, check the rest.
+	for (size_t i = 1; i < bytesExpected; i++) {
+		if (!IsInsideGlyph(bytes[i])) {
+			// The sequence is incomplete.
+			return 0;
+		}
+	}
+
+	// Puh, everything's fine.
+	return bytesExpected;
+}
+
+
 static inline uint32
 UTF8PreviousCharLen(const char *text, const char *limit)
 {