fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-30 10:47:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix buffer overflow if output iterator is std::back_insert_iterator and value is escaped (debug format)

Browse Source 
Signed-off-by: Vladislav Shchapov <vladislav@shchapov.ru>
This commit is contained in:
Vladislav Shchapov
2024-01-10 16:52:52 +05:00
committed by Victor Zverovich
parent 401f087394
commit 961df829b9
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/fmt/format.h
View File

@ -2388,9 +2388,12 @@ FMT_CONSTEXPR auto write(OutputIt out, basic_string_view<Char> s,
size = code_point_index(s, to_unsigned(specs.precision)); size = code_point_index(s, to_unsigned(specs.precision));
bool is_debug = specs.type == presentation_type::debug; bool is_debug = specs.type == presentation_type::debug;
size_t width = 0; size_t width = 0;
if (is_debug) size = write_escaped_string(counting_iterator{}, s).count();
if (specs.width != 0) { if (specs.width != 0) {
if (is_debug) if (is_debug)
width = write_escaped_string(counting_iterator{}, s).count(); width = size;
else else
width = compute_width(basic_string_view<Char>(data, size)); width = compute_width(basic_string_view<Char>(data, size));
} }

12
test/compile-test.cc
View File

@ -85,6 +85,16 @@ TEST(compile_test, format_default) {
# endif # endif
} }
TEST(compile_test, format_escape) {
EXPECT_EQ("\"string\"", fmt::format(FMT_COMPILE("{:?}"), "string"));
EXPECT_EQ("prefix \"string\"",
fmt::format(FMT_COMPILE("prefix {:?}"), "string"));
EXPECT_EQ("\"string\" suffix",
fmt::format(FMT_COMPILE("{:?} suffix"), "string"));
EXPECT_EQ("\"abc\"", fmt::format(FMT_COMPILE("{0:<5?}"), "abc"));
EXPECT_EQ("\"abc\" ", fmt::format(FMT_COMPILE("{0:<7?}"), "abc"));
}
TEST(compile_test, format_wide_string) { TEST(compile_test, format_wide_string) {
EXPECT_EQ(L"42", fmt::format(FMT_COMPILE(L"{}"), 42)); EXPECT_EQ(L"42", fmt::format(FMT_COMPILE(L"{}"), 42));
} }
@ -288,7 +298,7 @@ TEST(compile_test, compile_format_string_literal) {
// line 8635) // line 8635)
#if (FMT_CPLUSPLUS >= 202002L || \ #if (FMT_CPLUSPLUS >= 202002L || \
(FMT_CPLUSPLUS >= 201709L && FMT_GCC_VERSION >= 1002)) && \ (FMT_CPLUSPLUS >= 201709L && FMT_GCC_VERSION >= 1002)) && \
((!FMT_GLIBCXX_RELEASE || FMT_GLIBCXX_RELEASE >= 10) && \ ((!FMT_GLIBCXX_RELEASE || FMT_GLIBCXX_RELEASE >= 10) && \
(!defined(_LIBCPP_VERSION) || _LIBCPP_VERSION >= 10000) && \ (!defined(_LIBCPP_VERSION) || _LIBCPP_VERSION >= 10000) && \
(!FMT_MSC_VERSION || \ (!FMT_MSC_VERSION || \
(FMT_MSC_VERSION >= 1928 && FMT_MSC_VERSION < 1930))) && \ (FMT_MSC_VERSION >= 1928 && FMT_MSC_VERSION < 1930))) && \