mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2025-02-06 03:40:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve name argument validation

Browse Source
This commit is contained in:
Victor Zverovich 2024-01-19 16:06:06 -08:00
parent 2eb363297b
commit 4c5b4af04d
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/fmt/base.h
View File

@ -772,7 +772,9 @@ template <typename Char> class basic_format_parse_context {
next_arg_id_ = -1; next_arg_id_ = -1;
do_check_arg_id(id); do_check_arg_id(id);
} }
FMT_CONSTEXPR void check_arg_id(basic_string_view<Char>) {} FMT_CONSTEXPR void check_arg_id(basic_string_view<Char>) {
next_arg_id_ = -1;
}
FMT_CONSTEXPR void check_dynamic_spec(int arg_id); FMT_CONSTEXPR void check_dynamic_spec(int arg_id);
}; };

4
include/fmt/format.h
View File

@ -4264,9 +4264,11 @@ void vformat_to(buffer<Char>& buf, basic_string_view<Char> fmt,
return parse_context.next_arg_id(); return parse_context.next_arg_id();
} }
FMT_CONSTEXPR auto on_arg_id(int id) -> int { FMT_CONSTEXPR auto on_arg_id(int id) -> int {
return parse_context.check_arg_id(id), id; parse_context.check_arg_id(id);
return id;
} }
FMT_CONSTEXPR auto on_arg_id(basic_string_view<Char> id) -> int { FMT_CONSTEXPR auto on_arg_id(basic_string_view<Char> id) -> int {
parse_context.check_arg_id(id);
int arg_id = context.arg_id(id); int arg_id = context.arg_id(id);
if (arg_id < 0) report_error("argument not found"); if (arg_id < 0) report_error("argument not found");
return arg_id; return arg_id;

6
test/args-test.cc
View File

@ -144,9 +144,9 @@ TEST(args_test, reserve) {
fmt::dynamic_format_arg_store<fmt::format_context> store; fmt::dynamic_format_arg_store<fmt::format_context> store;
store.reserve(2, 1); store.reserve(2, 1);
store.push_back(1.5f); store.push_back(1.5f);
store.push_back(fmt::arg("a1", 42)); store.push_back(fmt::arg("a", 42));
auto result = fmt::vformat("{a1} and {}", store); auto result = fmt::vformat("{} and {a}", store);
EXPECT_EQ("42 and 1.5", result); EXPECT_EQ("1.5 and 42", result);
} }
struct copy_throwable { struct copy_throwable {

5
test/format-test.cc
View File

@ -555,6 +555,9 @@ TEST(format_test, named_arg) {
"argument not found"); "argument not found");
EXPECT_THROW_MSG((void)fmt::format(runtime("{a}"), 42), format_error, EXPECT_THROW_MSG((void)fmt::format(runtime("{a}"), 42), format_error,
"argument not found"); "argument not found");
EXPECT_THROW_MSG((void)fmt::format(runtime("{a} {}"), fmt::arg("a", 2), 42),
format_error,
"cannot switch from manual to automatic argument indexing");
} }
TEST(format_test, auto_arg_index) { TEST(format_test, auto_arg_index) {
@ -1742,7 +1745,7 @@ TEST(format_test, print) {
} }
TEST(format_test, big_print) { TEST(format_test, big_print) {
enum {count = 5000}; enum { count = 5000 };
auto big_print = []() { auto big_print = []() {
for (int i = 0; i < count / 5; ++i) fmt::print("xxxxx"); for (int i = 0; i < count / 5; ++i) fmt::print("xxxxx");
}; };