AuroraMiddleware/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-11-14 23:11:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of invalid Unicode in precision

Browse Source
This commit is contained in:
Victor Zverovich 2023-11-18 07:54:36 -10:00
parent 864a8b5f38
commit c13753a70c
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/fmt/format.h
View File

@ -791,12 +791,18 @@ inline auto code_point_index(basic_string_view<Char> s, size_t n) -> size_t {
// Calculates the index of the nth code point in a UTF-8 string. // Calculates the index of the nth code point in a UTF-8 string.
inline auto code_point_index(string_view s, size_t n) -> size_t { inline auto code_point_index(string_view s, size_t n) -> size_t {
const char* data = s.data(); size_t result = s.size();
size_t num_code_points = 0; const char* begin = s.begin();
for (size_t i = 0, size = s.size(); i != size; ++i) { for_each_codepoint(
if ((data[i] & 0xc0) != 0x80 && ++num_code_points > n) return i; s, [begin, &n, &result](uint32_t, string_view sv) {
} if (n != 0) {
return s.size(); --n;
return true;
}
result = to_unsigned(sv.begin() - begin);
return false;
});
return result;
} }
inline auto code_point_index(basic_string_view<char8_type> s, size_t n) inline auto code_point_index(basic_string_view<char8_type> s, size_t n)
@ -1962,8 +1968,9 @@ auto write_escaped_char(OutputIt out, Char v) -> OutputIt {
*out++ = static_cast<Char>('\''); *out++ = static_cast<Char>('\'');
if ((needs_escape(static_cast<uint32_t>(v)) && v != static_cast<Char>('"')) || if ((needs_escape(static_cast<uint32_t>(v)) && v != static_cast<Char>('"')) ||
v == static_cast<Char>('\'')) { v == static_cast<Char>('\'')) {
out = write_escaped_cp( out = write_escaped_cp(out,
out, find_escape_result<Char>{v_array, v_array + 1, static_cast<uint32_t>(v)}); find_escape_result<Char>{v_array, v_array + 1,
static_cast<uint32_t>(v)});
} else { } else {
*out++ = v; *out++ = v;
} }

1
test/format-test.cc
View File

@ -1050,6 +1050,7 @@ TEST(format_test, precision) {
EXPECT_EQ("st", fmt::format("{0:.2}", "str")); EXPECT_EQ("st", fmt::format("{0:.2}", "str"));
EXPECT_EQ("вожык", fmt::format("{0:.5}", "вожыкі")); EXPECT_EQ("вожык", fmt::format("{0:.5}", "вожыкі"));
EXPECT_EQ("123456", fmt::format("{0:.6}", "123456\xad"));
} }
TEST(format_test, runtime_precision) { TEST(format_test, runtime_precision) {