1
0
mirror of https://github.com/gabime/spdlog.git synced 2025-04-30 04:23:51 +00:00
This commit is contained in:
Gabi Melman 2025-03-17 15:46:31 +02:00 committed by GitHub
parent 3335c380a0
commit 10320184df
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -70,6 +70,9 @@ public:
pad_it(remaining_pad_); pad_it(remaining_pad_);
} else if (padinfo_.truncate_) { } else if (padinfo_.truncate_) {
long new_size = static_cast<long>(dest_.size()) + remaining_pad_; long new_size = static_cast<long>(dest_.size()) + remaining_pad_;
if (new_size < 0) {
new_size = 0;
}
dest_.resize(static_cast<size_t>(new_size)); dest_.resize(static_cast<size_t>(new_size));
} }
} }
@ -264,7 +267,7 @@ public:
: flag_formatter(padinfo) {} : flag_formatter(padinfo) {}
void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override { void format(const details::log_msg &, const std::tm &tm_time, memory_buf_t &dest) override {
const size_t field_size = 10; const size_t field_size = 8;
ScopedPadder p(field_size, padinfo_, dest); ScopedPadder p(field_size, padinfo_, dest);
fmt_helper::pad2(tm_time.tm_mon + 1, dest); fmt_helper::pad2(tm_time.tm_mon + 1, dest);
@ -928,7 +931,6 @@ private:
#ifndef SPDLOG_NO_TLS #ifndef SPDLOG_NO_TLS
mdc_formatter<null_scoped_padder> mdc_formatter_{padding_info {}}; mdc_formatter<null_scoped_padder> mdc_formatter_{padding_info {}};
#endif #endif
}; };
} // namespace details } // namespace details