External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure unit isn't null before constructing a string_view from it

Browse Source
This commit is contained in:
zeffy 2020-01-23 17:28:20 -08:00
parent 3aae6d2350
commit 708c28b952
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/fmt/chrono.h
View File

@ -771,12 +771,13 @@ OutputIt format_duration_value(OutputIt out, Rep val, int precision) {
template <typename Char, typename Period, typename OutputIt> template <typename Char, typename Period, typename OutputIt>
OutputIt format_duration_unit(OutputIt out) { OutputIt format_duration_unit(OutputIt out) {
if (string_view unit = get_units<Period>()) { if (const char* unit = get_units<Period>()) {
string_view s(unit);
if (const_check(std::is_same<Char, wchar_t>())) { if (const_check(std::is_same<Char, wchar_t>())) {
utf8_to_utf16 u(unit); utf8_to_utf16 u(s);
return std::copy(u.c_str(), u.c_str() + u.size(), out); return std::copy(u.c_str(), u.c_str() + u.size(), out);
} }
return std::copy(unit.begin(), unit.end(), out); return std::copy(s.begin(), s.end(), out);
} }
const Char num_f[]{'[', '{', '}', ']', 's', 0}; const Char num_f[]{'[', '{', '}', ']', 's', 0};
if (Period::den == 1) return format_to(out, num_f, Period::num); if (Period::den == 1) return format_to(out, num_f, Period::num);