shithub: sl

Info  •  Files  •  Log  •  Branches

u8_nextmemchar: make clang-analyzer less confused

--- a/utf8.c

+++ b/utf8.c

@@ -80,13 +80,13 @@

 Rune

 u8_nextmemchar(const char *s, size_t *i)

 {

-	size_t sz = u8_seqlen(&s[*i]);

+	size_t sz = trailingBytesForUTF8[(uint8_t)s[*i]];

 	Rune ch = 0;

-	for(size_t j = 0; j < sz; j++){

+	for(size_t j = 0; j <= sz; j++){

 		ch <<= 6;

 		ch += (uint8_t)s[(*i)++];

 	};

-	return ch - offsetsFromUTF8[sz-1];

+	return ch - offsetsFromUTF8[sz];

 }

 int