| commit | a719850ca4328db934c96c7f6064b51b74afa51c | [log] [tgz] |
|---|---|---|
| author | Arthur Sonzogni <arthursonzogni@chromium.org> | Mon Nov 13 13:12:09 2023 |
| committer | Chromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com> | Mon Nov 13 13:12:09 2023 |
| tree | 0e37782e8d2d492b92979a60a776fc61ac91df16 | |
| parent | 4d2702cde50a751e528bbb0675158cfaee062be5 [diff] |
Fix PartitionAlloc's PrintStackTrace error with MSVC. This fixes the error: ``` error C2131: expression did not evaluate to a constant ``` Bug: chromium:1464560 Change-Id: I67456c7d8b71b0e1da20b366fc423eb135577b45 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5017907 Auto-Submit: Arthur Sonzogni <arthursonzogni@chromium.org> Reviewed-by: danakj <danakj@chromium.org> Commit-Queue: Arthur Sonzogni <arthursonzogni@chromium.org> Cr-Commit-Position: refs/heads/main@{#1223571}
diff --git a/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_win.cc b/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_win.cc index dd347d0..40401a4a 100644 --- a/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_win.cc +++ b/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/debug/stack_trace_win.cc
@@ -9,8 +9,9 @@ #include "base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/strings/safe_sprintf.h" #include <windows.h> +#include <algorithm> -#include <psapi.h> +#include <psapi.h> // Depends on "windows.h" namespace partition_alloc::internal::base::debug { @@ -23,7 +24,9 @@ return; } - bool is_output_trace[count]; + constexpr size_t kMaxTraces = 32u; + count = std::max(count, kMaxTraces); + bool is_output_trace[kMaxTraces]; for (size_t i = 0; i < count; ++i) { is_output_trace[i] = false; }