diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-01-02 15:30:36 +0300 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-03-10 13:18:25 +0100 |
| commit | 99608278c891904d601377fbae77de165396f025 (patch) | |
| tree | 956bc2f5a16a42460211cc8624dd0d1504803cc2 /desktop/source/app/app.cxx | |
| parent | 6935465f9b56d99557ba627d845b9d1a2f2f2d07 (diff) | |
Delete google_breakpad::ExceptionHandler before calling _exit()
While debugging tdf#129712 on Windows, I saw this sequence:
1. nullptr was dereferenced (the reason for tdf#129712).
2. ExceptionHandler::HandleException was called (in
workdir/UnpackedTarball/breakpad/src/client/windows/handler/exception_handler.cc).
3. It called ExceptionHandler::WriteMinidumpOnHandlerThread.
4. Minidump was created in ExceptionHandler::ExceptionHandlerThreadMain.
5. Document Recovery dialog was shown in Desktop::Exception (in
desktop/source/app/app.cxx).
6. After closing dialog, _exit() was called in Desktop::Exception.
7. All threads except main were terminated.
8. Another access violation was thrown in the "minimal CRT cleanup".
9. ExceptionHandler::HandleException called again.
10. ExceptionHandler::WriteMinidumpOnHandlerThread hung on WaitForSingleObject
because handler thread that should release the semaphore was terminated
already at step 7.
The process had to be killed manually.
This change destroys the breakpad handler at the start of Desktop::Exception,
which de-registers itself (on Windows it uses SetUnhandledExceptionFilter).
Other than preventing the hang, the rationale also is that keeping the handler
after first minidump creation is wrong: even if the second minidump creation
succeeded, uploading it to crashdump server would give not the actual problem,
but some unrelated stack.
Change-Id: If12d0c7db519693f733b5ab3b8a288cef800a149
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86104
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 12b5892cf9c78dd917f2e50672cd250478e6c7d6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89861
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'desktop/source/app/app.cxx')
| -rw-r--r-- | desktop/source/app/app.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 76b2f93c95fb..3a4322933b25 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1142,6 +1142,10 @@ void Desktop::Exception(ExceptionCategory nCategory) // protect against recursive calls static bool bInException = false; +#if HAVE_FEATURE_BREAKPAD + CrashReporter::removeExceptionHandler(); // disallow re-entry +#endif + SystemWindowFlags nOldMode = Application::GetSystemWindowMode(); Application::SetSystemWindowMode( nOldMode & ~SystemWindowFlags::NOAUTOMODE ); if ( bInException ) |