organicmaps/utfcpp
13
Fork 0
mirror of https://github.com/nemtrif/utfcpp.git synced 2025-04-04 13:05:06 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Fix for issue #78: unchecked::utf16to8 reads out of bounds if provided only leading surrogate

Browse source
This commit is contained in:
nemtrif 2023-09-24 17:17:18 -04:00
parent 0c8da664ee
commit 0ee84daac8
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/utf8/unchecked.h
View file

@ -155,7 +155,9 @@ namespace utf8
{
while (start != end) {
uint32_t cp = utf8::internal::mask16(*start++);
// Take care of surrogate pairs first
if (start == end)
return result;
// Take care of surrogate pairs first
if (utf8::internal::is_lead_surrogate(cp)) {
uint32_t trail_surrogate = utf8::internal::mask16(*start++);
cp = (cp << 10) + trail_surrogate + internal::SURROGATE_OFFSET;

5
tests/test_unchecked_api.h
View file

@ -137,6 +137,11 @@ TEST(UnCheckedAPITests, test_utf16to8)
string utf8result;
utf8::unchecked::utf16to8(utf16string, utf16string + 5, back_inserter(utf8result));
EXPECT_EQ (utf8result.size(), 10);
utf8result.clear();
unsigned short highsurrogateonly[] = {0xd800};
utf8::unchecked::utf16to8(highsurrogateonly, highsurrogateonly + 1, back_inserter(utf8result));
EXPECT_TRUE(true); // we didn't crash
}
TEST(UnCheckedAPITests, test_utf8to16)