coffee/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2026-06-15 08:26:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix formatting std::tm with null tm_zone (#4790)

Browse Source
This commit is contained in:
Jiami Lin 2026-06-02 09:16:49 +08:00 committed by GitHub
parent f53c0408a3
commit a90ad5d6fd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/fmt/chrono.h
View File

@ -1192,6 +1192,7 @@ class tm_writer {
template <typename T, FMT_ENABLE_IF(has_tm_zone<T>::value)> template <typename T, FMT_ENABLE_IF(has_tm_zone<T>::value)>
void format_tz_name(const T& tm) { void format_tz_name(const T& tm) {
if (!tm.tm_zone) FMT_THROW(format_error("no timezone"));
out_ = write_tm_str<Char>(out_, tm.tm_zone, loc_); out_ = write_tm_str<Char>(out_, tm.tm_zone, loc_);
} }
template <typename T, FMT_ENABLE_IF(!has_tm_zone<T>::value)> template <typename T, FMT_ENABLE_IF(!has_tm_zone<T>::value)>

3
test/chrono-test.cc
View File

@ -358,6 +358,9 @@ TEST(chrono_test, tm) {
char tz[] = "EET"; char tz[] = "EET";
if (fmt::detail::set_tm_zone(time, tz)) { if (fmt::detail::set_tm_zone(time, tz)) {
EXPECT_EQ(fmt::format(fmt::runtime("{:%Z}"), time), "EET"); EXPECT_EQ(fmt::format(fmt::runtime("{:%Z}"), time), "EET");
fmt::detail::set_tm_zone(time, nullptr);
EXPECT_THROW_MSG((void)fmt::format(fmt::runtime("{:%Z}"), time),
fmt::format_error, "no timezone");
} else { } else {
EXPECT_THROW_MSG((void)fmt::format(fmt::runtime("{:%Z}"), time), EXPECT_THROW_MSG((void)fmt::format(fmt::runtime("{:%Z}"), time),
fmt::format_error, "no timezone"); fmt::format_error, "no timezone");