X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=utf8lib.c;h=bb775b7fd91b749a4593382f52691135c58f4250;hb=1ece87d8bb9a5260662407f3690e48b907e5d870;hp=0461672d796688b3bee06f2ab17a2bc058a9067d;hpb=c9a9293b71eae9888690d8c6d8985c6b0a1bec00;p=xonotic%2Fdarkplaces.git

diff --git a/utf8lib.c b/utf8lib.c
index 0461672d..bb775b7f 100644
--- a/utf8lib.c
+++ b/utf8lib.c
@@ -691,7 +691,7 @@ u8_COM_StringLengthNoColors(const char *_s, size_t size_s, qboolean *valid)
 
 	for(;;)
 	{
-		switch((s >= end) ? 0 : *s)
+		switch((s == end) ? 0 : *s)
 		{
 			case 0:
 				if(valid)
@@ -728,6 +728,7 @@ u8_COM_StringLengthNoColors(const char *_s, size_t size_s, qboolean *valid)
 						++len; // the character
 						break;
 				}
+				++s;
 				continue;
 			default:
 				break;
@@ -756,7 +757,7 @@ u8_COM_StringLengthNoColors(const char *_s, size_t size_s, qboolean *valid)
 			return len;
 		}
 
-		if(s + st + ln >= end)
+		if(end && s + st + ln > end)
 		{
 			// string length exceeded by new character
 			if(valid)