From 5d2905696a26df11b8866dd000a6fa8bbf4181b0 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 14 May 2026 16:12:02 -0700 Subject: [PATCH] [breakpad] Avoid stdext::checked_array_iterator (#51774) --- ports/breakpad/add-algorithm-1.patch | 2 +- ports/breakpad/avoid-checked-array-iterator.diff | 13 +++++++++++++ ports/breakpad/portfile.cmake | 1 + ports/breakpad/vcpkg.json | 1 + versions/b-/breakpad.json | 5 +++++ versions/baseline.json | 2 +- 6 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 ports/breakpad/avoid-checked-array-iterator.diff diff --git a/ports/breakpad/add-algorithm-1.patch b/ports/breakpad/add-algorithm-1.patch index 20b13ed227..a1b8525cdf 100644 --- a/ports/breakpad/add-algorithm-1.patch +++ b/ports/breakpad/add-algorithm-1.patch @@ -1,5 +1,5 @@ diff --git a/src/common/string_view.h b/src/common/string_view.h -index a8e15922..bcaa7b96 100644 +index a8e1592..bcaa7b9 100644 --- a/src/common/string_view.h +++ b/src/common/string_view.h @@ -29,6 +29,7 @@ diff --git a/ports/breakpad/avoid-checked-array-iterator.diff b/ports/breakpad/avoid-checked-array-iterator.diff new file mode 100644 index 0000000000..9e6af4027c --- /dev/null +++ b/ports/breakpad/avoid-checked-array-iterator.diff @@ -0,0 +1,13 @@ +diff --git a/src/client/windows/crash_generation/minidump_generator.cc b/src/client/windows/crash_generation/minidump_generator.cc +index a0454cf..a977fc3 100644 +--- a/src/client/windows/crash_generation/minidump_generator.cc ++++ b/src/client/windows/crash_generation/minidump_generator.cc +@@ -179,7 +179,7 @@ bool HandleTraceData::CollectHandleData( + stream_data->Reserved = 0; + std::copy(operations_.begin(), + operations_.end(), +-#if defined(_MSC_VER) && !defined(_LIBCPP_STD_VER) ++#if defined(_MSC_VER) && !defined(_LIBCPP_STD_VER) && _MSC_VER < 1951 + stdext::checked_array_iterator( + reinterpret_cast(stream_data + 1), + operations_.size()) diff --git a/ports/breakpad/portfile.cmake b/ports/breakpad/portfile.cmake index 112a9eec1e..22463c04a7 100644 --- a/ports/breakpad/portfile.cmake +++ b/ports/breakpad/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( HEAD_REF master PATCHES add-algorithm-1.patch + avoid-checked-array-iterator.diff ) if(VCPKG_HOST_IS_LINUX OR VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID) diff --git a/ports/breakpad/vcpkg.json b/ports/breakpad/vcpkg.json index 101050945c..5955c037cf 100644 --- a/ports/breakpad/vcpkg.json +++ b/ports/breakpad/vcpkg.json @@ -1,6 +1,7 @@ { "name": "breakpad", "version-date": "2024-02-16", + "port-version": 1, "description": "a set of client and server components which implement a crash-reporting system.", "homepage": "https://github.com/google/breakpad", "license": "BSD-3-Clause", diff --git a/versions/b-/breakpad.json b/versions/b-/breakpad.json index 8c9f1da8d2..b0fdfb1ae5 100644 --- a/versions/b-/breakpad.json +++ b/versions/b-/breakpad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e8447b574fa2cbca8b2343a609dcec8779ea7611", + "version-date": "2024-02-16", + "port-version": 1 + }, { "git-tree": "d0b9b0c733d8e82f954990673865df8768b5d8e7", "version-date": "2024-02-16", diff --git a/versions/baseline.json b/versions/baseline.json index 7b000814ef..cf1e0823e5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1478,7 +1478,7 @@ }, "breakpad": { "baseline": "2024-02-16", - "port-version": 0 + "port-version": 1 }, "brigand": { "baseline": "1.3.0",