Fixing invalid data access in unicode character mapping

gershnik · Jan 7, 2025 · 1773cdb · 1773cdb
1 parent f6d5127
commit 1773cdb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/inc/sys_string/impl/unicode/mappings.h b/lib/inc/sys_string/impl/unicode/mappings.h
@@ -52,7 +52,7 @@ namespace sysstr::util
                 m_mapped(mapped)
             {}
             template<utf_encoding Enc, class OutIt>
-            auto write(char32_t c, OutIt dest) const noexcept(noexcept(*dest++ = utf_char_of<Enc>())) -> OutIt
+            static auto write(char32_t c, OutIt dest) noexcept(noexcept(*dest++ = utf_char_of<Enc>())) -> OutIt
             {
                 if constexpr (Enc == utf32)
                 {
@@ -67,7 +67,7 @@ namespace sysstr::util
                 }
             }
             template<utf_encoding Enc, class OutIt>
-            auto write(const char16_t * begin, const char16_t * end, OutIt dest) const noexcept(noexcept(*dest++ = utf_char_of<Enc>())) -> OutIt
+            static auto write(const char16_t * begin, const char16_t * end, OutIt dest) noexcept(noexcept(*dest++ = utf_char_of<Enc>())) -> OutIt
             {
                 if constexpr (Enc == utf16)
                 {
@@ -80,7 +80,7 @@ namespace sysstr::util
                     {
                         decoder.put(*begin++);
                         if (!decoder.done())
-                            decoder.put(m_mapped[*begin++]); //no need to bounds check, we know end is good
+                            decoder.put(*begin++); //no need to bounds check, we know end is good
                         dest = write<Enc>(decoder.value(), dest);
                     }
                     return dest;

diff --git a/test/test_general.cpp b/test/test_general.cpp
@@ -233,6 +233,8 @@ TEST_CASE( "Case conversion", "[general]" ) {
     CHECK(S("ΑΣͺΑ").to_lower() == S("ασͺα"));
 
     CHECK(S("βους").to_upper() == S("ΒΟΥΣ"));
+
+    CHECK(S("\U00010400").to_lower() == S("\U00010428"));
 }
 
 TEST_CASE( "Trim", "[general]" ) {