@@ -97,11 +97,11 @@
 			madvise((void*)str, len, MADV_NORMAL);
 			return -1;
 		}
 
 		/* We have at minimum a 2 byte character -> check next byte */
-		if (OF_UNLIKELY(len < i + 1 || (str[i + 1] & 0xC0) != 0x80)) {
+		if (OF_UNLIKELY(len <= i + 1 || (str[i + 1] & 0xC0) != 0x80)) {
 			madvise((void*)str, len, MADV_NORMAL);
 			return -1;
 		}
 
 		/* Check if we have at minimum a 3 byte character */
@@ -109,11 +109,11 @@
 			i++;
 			continue;
 		}
 
 		/* We have at minimum a 3 byte char -> check second next byte */
-		if (OF_UNLIKELY(len < i + 2 || (str[i + 2] & 0xC0) != 0x80)) {
+		if (OF_UNLIKELY(len <= i + 2 || (str[i + 2] & 0xC0) != 0x80)) {
 			madvise((void*)str, len, MADV_NORMAL);
 			return -1;
 		}
 
 		/* Check if we have a 4 byte character */
@@ -121,11 +121,11 @@
 			i += 2;
 			continue;
 		}
 
 		/* We have a 4 byte character -> check third next byte */
-		if (OF_UNLIKELY(len < i + 3 || (str[i + 3] & 0xC0) != 0x80)) {
+		if (OF_UNLIKELY(len <= i + 3 || (str[i + 3] & 0xC0) != 0x80)) {
 			madvise((void*)str, len, MADV_NORMAL);
 			return -1;
 		}
 
 		/*