MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-06-02 18:18:56 +02:00
Code Issues Releases Wiki Activity

ircd::fmt: Fix unconditional null termination regression.

Browse source
This commit is contained in:
Jason Volk 2018-12-15 17:46:35 -08:00
parent d7891d91e8
commit a8584f3336
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ircd/fmt.cc
View file

@ -345,6 +345,11 @@ try
const std::type_index type(*get<1>(*it));
argument(std::make_tuple(ptr, type));
}
// Ensure null termination if out buffer is non-empty.
assert(size(this->out) > 0);
assert(this->out.remaining());
copy(this->out, "\0"_sv);
}
catch(const std::out_of_range &e)
{
@ -444,7 +449,12 @@ try
const auto &handler(*specifiers.at(spec.name));
auto &outp(std::get<0>(out));
const size_t max(size(out));
assert(size(out));
const size_t max
{
size(out) - 1 // Leave room for null byte for later.
};
if(unlikely(!handler(outp, max, spec, val)))
throw invalid_type
{