Skip to content

BWF: Fix handling of null char * - avoid string_view constructor. #4718

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shinrich merged 1 commit into from
Dec 18, 2018
Merged

BWF: Fix handling of null char * - avoid string_view constructor. #4718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions include/tscore/BufferWriter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,12 +704,26 @@ BufferWriter::printv(BWFormat const &fmt, std::tuple<Args...> const &args)
return *this;
}

// Must be first so that other inline formatters can use it.
BufferWriter &bwformat(BufferWriter &w, BWFSpec const &spec, std::string_view sv);

// Pointers that are not specialized.
inline BufferWriter &
bwformat(BufferWriter &w, BWFSpec const &spec, const void *ptr)
{
BWFSpec ptr_spec{spec};
ptr_spec._radix_lead_p = true;

if (ptr == nullptr) {
if (spec._type == 's' || spec._type == 'S') {
ptr_spec._type = BWFSpec::DEFAULT_TYPE;
ptr_spec._ext = ""_sv; // clear any extension.
return bwformat(w, spec, spec._type == 's' ? "null"_sv : "NULL"_sv);
} else if (spec._type == BWFSpec::DEFAULT_TYPE) {
return w; // print nothing if there is no format character override.
}
}

if (ptr_spec._type == BWFSpec::DEFAULT_TYPE || ptr_spec._type == 'p') {
ptr_spec._type = 'x'; // if default or 'p;, switch to lower hex.
} else if (ptr_spec._type == 'P') {
Expand All @@ -723,7 +737,12 @@ BufferWriter &bwformat(BufferWriter &w, BWFSpec const &spec, MemSpan const &span

// -- Common formatters --

BufferWriter &bwformat(BufferWriter &w, BWFSpec const &spec, std::string_view sv);
// Capture this explicitly so it doesn't go to any other pointer type.
inline BufferWriter &
bwformat(BufferWriter &w, BWFSpec const &spec, std::nullptr_t)
{
return bwformat(w, spec, static_cast<void *>(nullptr));
}

template <size_t N>
BufferWriter &
Expand All @@ -735,10 +754,12 @@ bwformat(BufferWriter &w, BWFSpec const &spec, const char (&a)[N])
inline BufferWriter &
bwformat(BufferWriter &w, BWFSpec const &spec, const char *v)
{
if (spec._type == 'x' || spec._type == 'X') {
if (spec._type == 'x' || spec._type == 'X' || spec._type == 'p') {
bwformat(w, spec, static_cast<const void *>(v));
} else {
} else if (v != nullptr) {
bwformat(w, spec, std::string_view(v));
} else {
bwformat(w, spec, nullptr);
}
return w;
}
Expand Down
8 changes: 8 additions & 0 deletions src/tscore/unit_tests/test_BufferWriterFormat.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,14 @@ TEST_CASE("bwstring", "[bwprint][bwstring]")
ts::bwprint(out, fmt, std::string_view(), "Leif", "confused");
REQUIRE(out == "Did you know? Leif is confused");
}

char const *null_string{nullptr};
ts::bwprint(s, "Null {0:x}.{0}", null_string);
REQUIRE(s == "Null 0x0.");
ts::bwprint(s, "Null {0:X}.{0}", nullptr);
REQUIRE(s == "Null 0X0.");
ts::bwprint(s, "Null {0:p}.{0:P}.{0:s}.{0:S}", null_string);
REQUIRE(s == "Null 0x0.0X0.null.NULL");
}

TEST_CASE("BWFormat integral", "[bwprint][bwformat]")
Expand Down