From af63d4358bc8dceb701312e5fb18718735a6c350 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 20 Nov 2026 12:06:27 +0100 Subject: [PATCH 1/2] fix: avoid reading past the input in `UTF32ToUTF16Char()` `UTF32` is `unsigned long`, so reading the 4-byte `wchar_t` through a `UTF32` pointer reads 8 bytes on 64-bit Linux and macOS: src/common/string_conversion.cc:107:16: error: array subscript 2 is outside array bounds of 'wchar_t [1]' [-Werror=array-bounds=] Convert the character into a `UTF32` local instead. --- src/common/string_conversion.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/common/string_conversion.cc b/src/common/string_conversion.cc index a4e64ff06..a241a79a5 100644 --- a/src/common/string_conversion.cc +++ b/src/common/string_conversion.cc @@ -103,7 +103,8 @@ void UTF32ToUTF16(const wchar_t* in, vector* out) { } void UTF32ToUTF16Char(wchar_t in, uint16_t out[2]) { - const UTF32* source_ptr = reinterpret_cast(&in); + const UTF32 source = in; + const UTF32* source_ptr = &source; const UTF32* source_end_ptr = source_ptr + 1; uint16_t* target_ptr = out; uint16_t* target_end_ptr = target_ptr + 2; From 06c8a83d979583b23ad425a1b58e65b016ee8dda Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 20 Nov 2026 12:06:27 +0100 Subject: [PATCH 2/2] fix: resolve -Wall warnings - unknown `#pragma warning` in the Windows `exception_handler.h` with MinGW - unused `machine_state` in `MinidumpGenerator::WriteContextARM64()` on macOS --- src/client/mac/handler/minidump_generator.cc | 2 -- src/client/windows/handler/exception_handler.h | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/client/mac/handler/minidump_generator.cc b/src/client/mac/handler/minidump_generator.cc index f55e2ca42..47ffb82ab 100644 --- a/src/client/mac/handler/minidump_generator.cc +++ b/src/client/mac/handler/minidump_generator.cc @@ -603,8 +603,6 @@ MinidumpGenerator::WriteContextARM64(breakpad_thread_state_data_t state, MDLocationDescriptor* register_location) { TypedMDRVA context(&writer_); - arm_thread_state64_t* machine_state = - reinterpret_cast(state); if (!context.Allocate()) return false; diff --git a/src/client/windows/handler/exception_handler.h b/src/client/windows/handler/exception_handler.h index 37ee68aaa..a1035dbea 100644 --- a/src/client/windows/handler/exception_handler.h +++ b/src/client/windows/handler/exception_handler.h @@ -60,9 +60,11 @@ #include #include +#ifdef _MSC_VER #pragma warning(push) // Disable exception handler warnings. #pragma warning(disable:4530) +#endif #include #include @@ -520,6 +522,8 @@ class ExceptionHandler { } // namespace google_breakpad +#ifdef _MSC_VER #pragma warning(pop) +#endif #endif // CLIENT_WINDOWS_HANDLER_EXCEPTION_HANDLER_H__