diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e63e3e95..65c1ac14a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## Unreleased + +**Fixes**: + +- Breakpad: fix loader deadlock when capturing crash dump while network requests are in flight. ([#1502](https://github.com/getsentry/sentry-native/pull/1502)) + ## 0.12.5 **Features**: diff --git a/src/backends/sentry_backend_breakpad.cpp b/src/backends/sentry_backend_breakpad.cpp index 86eb3bec4..dc25c5dd6 100644 --- a/src/backends/sentry_backend_breakpad.cpp +++ b/src/backends/sentry_backend_breakpad.cpp @@ -262,6 +262,8 @@ breakpad_backend_startup( && defined(SENTRY_THREAD_STACK_GUARANTEE_AUTO_INIT) sentry__set_default_thread_stack_guarantee(); # endif + // Pre-load to prevent frequent LoadPsApi deadlocks in MiniDumpWriteDump + LoadLibraryA("psapi.dll"); backend->data = new google_breakpad::ExceptionHandler( current_run_folder->path_w, nullptr, breakpad_backend_callback, nullptr, google_breakpad::ExceptionHandler::HANDLER_EXCEPTION);