mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-14 05:49:57 +00:00
Peter Marko
e67921006f
Same patch as in spdlog recipe. Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From 10320184df1eb4638e253a34b1eb44ce78954094 Mon Sep 17 00:00:00 2001
|
|
From: Gabi Melman <gmelman1@gmail.com>
|
|
Date: Mon, 17 Mar 2025 15:46:31 +0200
|
|
Subject: [PATCH] Fixed issue #3360 (#3361)
|
|
|
|
CVE: CVE-2025-6140
|
|
Upstream-Status: Backport [https://github.com/gabime/spdlog/commit/10320184df1eb4638e253a34b1eb44ce78954094]
|
|
Signed-off-by: Peter Marko <peter.marko@siemens.com>
|
|
---
|
|
include/spdlog/pattern_formatter-inl.h | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/include/spdlog/pattern_formatter-inl.h b/include/spdlog/pattern_formatter-inl.h
|
|
index b53d8051..fd408ed5 100644
|
|
--- a/include/spdlog/pattern_formatter-inl.h
|
|
+++ b/include/spdlog/pattern_formatter-inl.h
|
|
@@ -65,6 +65,9 @@ public:
|
|
pad_it(remaining_pad_);
|
|
} else if (padinfo_.truncate_) {
|
|
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));
|
|
}
|
|
}
|
|
@@ -259,7 +262,7 @@ public:
|
|
: flag_formatter(padinfo) {}
|
|
|
|
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);
|
|
|
|
fmt_helper::pad2(tm_time.tm_mon + 1, dest);
|