Skip to content

Commit 9698779

Browse files
KielekKielek
authored
Bump spdlog to 1.15.3 (#4852)
Fixes https://nvd.nist.gov/vuln/detail/CVE-2025-6140
1 parent 09f8ddf commit 9698779

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+7377
-6916
lines changed

‎docs/internal/native-dependencies.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ It will be updated automatically together with spdlog.
88
## spdlog
99

1010
* Source: <https://github.com/gabime/spdlog>
11-
* Version: 1.14.1
11+
* Version: 1.15.3
1212

1313
### Setup
1414

‎src/OpenTelemetry.AutoInstrumentation.Native/OpenTelemetry.AutoInstrumentation.Native.DLL.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@
112112
<SDLCheck>true</SDLCheck>
113113
<MultiProcessorCompilation>true</MultiProcessorCompilation>
114114
<AdditionalIncludeDirectories>$(LIB_INCLUDES);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
115+
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
115116
</ClCompile>
116117
<Link>
117118
<SubSystem>Windows</SubSystem>
@@ -135,6 +136,7 @@
135136
<LanguageStandard>stdcpp17</LanguageStandard>
136137
<MultiProcessorCompilation>true</MultiProcessorCompilation>
137138
<AdditionalIncludeDirectories>$(LIB_INCLUDES);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
139+
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
138140
</ClCompile>
139141
<Link>
140142
<SubSystem>Windows</SubSystem>
@@ -161,6 +163,7 @@
161163
<MultiProcessorCompilation>true</MultiProcessorCompilation>
162164
<AdditionalIncludeDirectories>$(LIB_INCLUDES);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
163165
<ControlFlowGuard>Guard</ControlFlowGuard>
166+
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
164167
</ClCompile>
165168
<Link>
166169
<SubSystem>Windows</SubSystem>
@@ -192,6 +195,7 @@
192195
<MultiProcessorCompilation>true</MultiProcessorCompilation>
193196
<AdditionalIncludeDirectories>$(LIB_INCLUDES);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
194197
<ControlFlowGuard>Guard</ControlFlowGuard>
198+
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
195199
</ClCompile>
196200
<Link>
197201
<SubSystem>Windows</SubSystem>

‎src/OpenTelemetry.AutoInstrumentation.Native/OpenTelemetry.AutoInstrumentation.Native.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
<PreprocessorDefinitions>BIT64;HOST_64BIT;AMD64;_UNICODE;UNICODE;OTEL_AUTO_VERSION_MAJOR=$(OTEL_AUTO_VERSION_MAJOR);OTEL_AUTO_VERSION_MINOR=$(OTEL_AUTO_VERSION_MINOR);OTEL_AUTO_VERSION_PATCH=$(OTEL_AUTO_VERSION_PATCH);%(PreprocessorDefinitions)</PreprocessorDefinitions>
9696
<AdditionalIncludeDirectories>$(LIB_INCLUDES);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9797
<TreatWarningAsError>true</TreatWarningAsError>
98+
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
9899
</ClCompile>
99100
<Lib>
100101
<AdditionalLibraryDirectories>$(LIB_INCLUDES);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -115,6 +116,7 @@
115116
<PreprocessorDefinitions>_UNICODE;UNICODE;X86;HOST_X86;OTEL_AUTO_VERSION_MAJOR=$(OTEL_AUTO_VERSION_MAJOR);OTEL_AUTO_VERSION_MINOR=$(OTEL_AUTO_VERSION_MINOR);OTEL_AUTO_VERSION_PATCH=$(OTEL_AUTO_VERSION_PATCH);%(PreprocessorDefinitions)</PreprocessorDefinitions>
116117
<AdditionalIncludeDirectories>$(LIB_INCLUDES);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
117118
<TreatWarningAsError>true</TreatWarningAsError>
119+
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
118120
</ClCompile>
119121
<Lib>
120122
<TargetMachine>MachineX86</TargetMachine>
@@ -141,6 +143,7 @@
141143
<AdditionalIncludeDirectories>$(LIB_INCLUDES);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
142144
<TreatWarningAsError>true</TreatWarningAsError>
143145
<ControlFlowGuard>Guard</ControlFlowGuard>
146+
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
144147
</ClCompile>
145148
<Lib>
146149
<AdditionalLibraryDirectories>$(LIB_INCLUDES);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -168,6 +171,7 @@
168171
<AdditionalIncludeDirectories>$(LIB_INCLUDES);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
169172
<TreatWarningAsError>true</TreatWarningAsError>
170173
<ControlFlowGuard>Guard</ControlFlowGuard>
174+
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
171175
</ClCompile>
172176
<Lib>
173177
<AdditionalLibraryDirectories>$(LIB_INCLUDES);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

‎src/OpenTelemetry.AutoInstrumentation.Native/lib/spdlog/include/spdlog/async.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ inline void init_thread_pool(size_t q_size,
8989
}
9090

9191
inline void init_thread_pool(size_t q_size, size_t thread_count) {
92-
init_thread_pool(
93-
q_size, thread_count, [] {}, [] {});
92+
init_thread_pool(q_size, thread_count, [] {}, [] {});
9493
}
9594

9695
// get the global thread pool.

‎src/OpenTelemetry.AutoInstrumentation.Native/lib/spdlog/include/spdlog/async_logger-inl.h‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ SPDLOG_INLINE spdlog::async_logger::async_logger(std::string logger_name,
3333
// send the log message to the thread pool
3434
SPDLOG_INLINE void spdlog::async_logger::sink_it_(const details::log_msg &msg){
3535
SPDLOG_TRY{if (auto pool_ptr = thread_pool_.lock()){
36-
pool_ptr->post_log(shared_from_this(), msg, overflow_policy_);
36+
pool_ptr -> post_log(shared_from_this(), msg, overflow_policy_);
3737
}
3838
else {
3939
throw_spdlog_ex("async log: thread pool doesn't exist anymore");
@@ -43,15 +43,13 @@ SPDLOG_LOGGER_CATCH(msg.source)
4343
}
4444

4545
// send flush request to the thread pool
46-
SPDLOG_INLINE void spdlog::async_logger::flush_(){SPDLOG_TRY{auto pool_ptr = thread_pool_.lock();
47-
if (!pool_ptr) {
46+
SPDLOG_INLINE void spdlog::async_logger::flush_(){
47+
SPDLOG_TRY{if (auto pool_ptr = thread_pool_.lock()){
48+
pool_ptr -> post_flush(shared_from_this(), overflow_policy_);
49+
}
50+
else {
4851
throw_spdlog_ex("async flush: thread pool doesn't exist anymore");
4952
}
50-
51-
std::future<void> future = pool_ptr->post_flush(shared_from_this(), overflow_policy_);
52-
// Wait for the flush operation to complete.
53-
// This might throw exception if the flush message get dropped because of overflow.
54-
future.get();
5553
}
5654
SPDLOG_LOGGER_CATCH(source_loc())
5755
}

‎src/OpenTelemetry.AutoInstrumentation.Native/lib/spdlog/include/spdlog/cfg/env.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525

2626
namespace spdlog {
2727
namespace cfg {
28-
inline void load_env_levels() {
29-
auto env_val = details::os::getenv("SPDLOG_LEVEL");
28+
inline void load_env_levels(const char* var = "SPDLOG_LEVEL") {
29+
auto env_val = details::os::getenv(var);
3030
if (!env_val.empty()) {
3131
helpers::load_levels(env_val);
3232
}

‎src/OpenTelemetry.AutoInstrumentation.Native/lib/spdlog/include/spdlog/common.h‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -364,12 +364,7 @@ SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view
364364
}
365365
#endif
366366

367-
#ifndef SPDLOG_USE_STD_FORMAT
368-
template <typename T, typename... Args>
369-
inline fmt::basic_string_view<T> to_string_view(fmt::basic_format_string<T, Args...> fmt) {
370-
return fmt;
371-
}
372-
#elif __cpp_lib_format >= 202207L
367+
#if defined(SPDLOG_USE_STD_FORMAT) && __cpp_lib_format >= 202207L
373368
template <typename T, typename... Args>
374369
SPDLOG_CONSTEXPR_FUNC std::basic_string_view<T> to_string_view(
375370
std::basic_format_string<T, Args...> fmt) SPDLOG_NOEXCEPT {

‎src/OpenTelemetry.AutoInstrumentation.Native/lib/spdlog/include/spdlog/details/file_helper-inl.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ SPDLOG_INLINE void file_helper::write(const memory_buf_t &buf) {
101101
if (fd_ == nullptr) return;
102102
size_t msg_size = buf.size();
103103
auto data = buf.data();
104-
if (std::fwrite(data, 1, msg_size, fd_) != msg_size) {
104+
105+
if (!details::os::fwrite_bytes(data, msg_size, fd_)) {
105106
throw_spdlog_ex("Failed writing to file " + os::filename_to_str(filename_), errno);
106107
}
107108
}

‎src/OpenTelemetry.AutoInstrumentation.Native/lib/spdlog/include/spdlog/details/mpmc_blocking_q.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,19 +148,19 @@ class mpmc_blocking_queue {
148148
#endif
149149

150150
size_t overrun_counter() {
151-
std::unique_lock<std::mutex> lock(queue_mutex_);
151+
std::lock_guard<std::mutex> lock(queue_mutex_);
152152
return q_.overrun_counter();
153153
}
154154

155155
size_t discard_counter() { return discard_counter_.load(std::memory_order_relaxed); }
156156

157157
size_t size() {
158-
std::unique_lock<std::mutex> lock(queue_mutex_);
158+
std::lock_guard<std::mutex> lock(queue_mutex_);
159159
return q_.size();
160160
}
161161

162162
void reset_overrun_counter() {
163-
std::unique_lock<std::mutex> lock(queue_mutex_);
163+
std::lock_guard<std::mutex> lock(queue_mutex_);
164164
q_.reset_overrun_counter();
165165
}
166166

‎src/OpenTelemetry.AutoInstrumentation.Native/lib/spdlog/include/spdlog/details/os-inl.h‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,10 @@ SPDLOG_INLINE int utc_minutes_offset(const std::tm &tm) {
265265
return offset;
266266
#else
267267

268-
#if defined(sun) || defined(__sun) || defined(_AIX) || \
269-
(defined(__NEWLIB__) && !defined(__TM_GMTOFF)) || \
270-
(!defined(_BSD_SOURCE) && !defined(_GNU_SOURCE))
268+
#if defined(sun) || defined(__sun) || defined(_AIX) || \
269+
(defined(__NEWLIB__) && !defined(__TM_GMTOFF)) || \
270+
(!defined(__APPLE__) && !defined(_BSD_SOURCE) && !defined(_GNU_SOURCE) && \
271+
(!defined(_POSIX_VERSION) || (_POSIX_VERSION < 202405L)))
271272
// 'tm_gmtoff' field is BSD extension and it's missing on SunOS/Solaris
272273
struct helper {
273274
static long int calculate_gmt_offset(const std::tm &localtm = details::os::localtime(),
@@ -482,13 +483,12 @@ SPDLOG_INLINE void utf8_to_wstrbuf(string_view_t str, wmemory_buf_t &target) {
482483
}
483484

484485
// find the size to allocate for the result buffer
485-
int result_size =
486-
::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, str.data(), str_size, NULL, 0);
486+
int result_size = ::MultiByteToWideChar(CP_UTF8, 0, str.data(), str_size, NULL, 0);
487487

488488
if (result_size > 0) {
489489
target.resize(result_size);
490-
result_size = ::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, str.data(), str_size,
491-
target.data(), result_size);
490+
result_size =
491+
::MultiByteToWideChar(CP_UTF8, 0, str.data(), str_size, target.data(), result_size);
492492
if (result_size > 0) {
493493
assert(result_size == target.size());
494494
return;
@@ -589,6 +589,18 @@ SPDLOG_INLINE bool fsync(FILE *fp) {
589589
#endif
590590
}
591591

592+
// Do non-locking fwrite if possible by the os or use the regular locking fwrite
593+
// Return true on success.
594+
SPDLOG_INLINE bool fwrite_bytes(const void *ptr, const size_t n_bytes, FILE *fp) {
595+
#if defined(_WIN32) && defined(SPDLOG_FWRITE_UNLOCKED)
596+
return _fwrite_nolock(ptr, 1, n_bytes, fp) == n_bytes;
597+
#elif defined(SPDLOG_FWRITE_UNLOCKED)
598+
return ::fwrite_unlocked(ptr, 1, n_bytes, fp) == n_bytes;
599+
#else
600+
return std::fwrite(ptr, 1, n_bytes, fp) == n_bytes;
601+
#endif
602+
}
603+
592604
} // namespace os
593605
} // namespace details
594606
} // namespace spdlog

0 commit comments

Comments
 (0)