fixed ibm437_to_utf8

ZDoom · Dec 12, 2023 · c95d611 · c95d611
1 parent 0bf6340
commit c95d611
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/common/filesystem/source/unicode.cpp b/src/common/filesystem/source/unicode.cpp
@@ -121,7 +121,7 @@ void ibm437_to_utf8(const char* in, std::vector<char>& buffer)
 
 	while (int char1 = (uint8_t)*in++)
 	{
-		if (char1 >= 0x80) char1 = ibm437map[char1];
+		if (char1 >= 0x80) char1 = ibm437map[char1 - 0x80];
 		utf8_encode(char1, buffer);
 	}
 	buffer.push_back(0);
@@ -140,4 +140,22 @@ char *tolower_normalize(const char *str)
 	return (char*)retval;
 }
 
+//==========================================================================
+//
+// validates the string for proper UTF-8
+//
+//==========================================================================
+
+bool unicode_validate(const char* str)
+{
+	while (*str != 0)
+	{
+		int cp;
+		int result = utf8proc_iterate((const uint8_t*)str, -1, &cp);
+		if (result < 0) return false;
+	}
+	return true;
+}
+
+
 }
diff --git a/src/common/filesystem/source/unicode.h b/src/common/filesystem/source/unicode.h
@@ -6,7 +6,7 @@ namespace FileSys {
 
 void utf16_to_utf8(const unsigned short* in, std::vector<char>& buffer);
 void ibm437_to_utf8(const char* in, std::vector<char>& buffer);
-int unicode_tolower(int c);
 char *tolower_normalize(const char *str);
+bool unicode_validate(const char* str);
 
 }