mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-11-02 11:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of empty non-null-terminated strings

Browse Source
This commit is contained in:
vitaut 2015-11-25 09:49:01 -08:00
parent 7cbb29f61e
commit b8bd80ff28
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
format.cc
View File

@ -432,7 +432,7 @@ class BasicArgFormatter : public ArgVisitor<Impl, void> {
} }
void write(const char *value) { void write(const char *value) {
Arg::StringValue<char> str = {value, 0}; Arg::StringValue<char> str = {value, value != 0 ? strlen(value) : 0};
writer_.write_str(str, spec_); writer_.write_str(str, spec_);
} }
@ -842,8 +842,6 @@ void fmt::BasicWriter<Char>::write_str(
FMT_THROW(FormatError("string pointer is null")); FMT_THROW(FormatError("string pointer is null"));
return; return;
} }
if (*str_value)
str_size = std::char_traits<StrChar>::length(str_value);
} }
std::size_t precision = spec.precision_; std::size_t precision = spec.precision_;
if (spec.precision_ >= 0 && precision < str_size) if (spec.precision_ >= 0 && precision < str_size)

9
test/format-test.cc
View File

@ -1649,3 +1649,12 @@ TEST(FormatTest, Enum) {
EXPECT_EQ("TestEnum", fmt::format("{}", TestEnum())); EXPECT_EQ("TestEnum", fmt::format("{}", TestEnum()));
EXPECT_EQ("0", fmt::format("{}", A)); EXPECT_EQ("0", fmt::format("{}", A));
} }
struct EmptyTest {};
std::ostream &operator<<(std::ostream &os, EmptyTest) {
return os << "";
}
TEST(FormatTest, EmptyCustomOutput) {
EXPECT_EQ("", fmt::format("{}", EmptyTest()));
}