Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 5b4773e

Browse files
luqunljkotas
authored andcommitted
AssemblyName parsing with unicode/emoji crashes (#18309)
1 parent d644d8a commit 5b4773e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/pal/src/locale/utf8.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1863,7 +1863,7 @@ class UTF8Encoding
18631863
if (ch > 0x7F)
18641864
goto ProcessChar;
18651865

1866-
*pTarget = (char)ch;
1866+
*pTarget = (WCHAR)ch;
18671867
pTarget++;
18681868
}
18691869
// we are done
@@ -1899,7 +1899,7 @@ class UTF8Encoding
18991899
if (ch > 0x7F) {
19001900
goto LongCode;
19011901
}
1902-
*pTarget = (char)ch;
1902+
*pTarget = (WCHAR)ch;
19031903
pTarget++;
19041904
}
19051905

@@ -2022,7 +2022,7 @@ class UTF8Encoding
20222022

20232023
ch = (chc << 6) | (ch & 0x3F);
20242024

2025-
*pTarget = (char)(((ch >> 10) & 0x7FF) +
2025+
*pTarget = (WCHAR)(((ch >> 10) & 0x7FF) +
20262026
(SHORT)(CharUnicodeInfo::HIGH_SURROGATE_START - (0x10000 >> 10)));
20272027
pTarget++;
20282028

0 commit comments

Comments
 (0)