Merge pull request #3877 from Kelimion/wstring_fix

Fix utf8_to_wstring given zero bytes.
odin-lang · Jul 5, 2024 · ecffe5a · ecffe5a
2 parents c8432df + 9ecc335
commit ecffe5a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/sys/windows/util.odin b/core/sys/windows/util.odin
@@ -53,8 +53,8 @@ utf8_to_utf16 :: proc(s: string, allocator := context.temp_allocator) -> []u16 {
 	return text[:n]
 }
 utf8_to_wstring :: proc(s: string, allocator := context.temp_allocator) -> wstring {
-	if res := utf8_to_utf16(s, allocator); res != nil {
-		return &res[0]
+	if res := utf8_to_utf16(s, allocator); len(res) > 0 {
+		return raw_data(res)
 	}
 	return nil
 }