diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-03-22 14:40:04 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2023-04-03 00:53:12 +0200 |
| commit | 7f57fc5f601758031962653551263e158bb5aa5f (patch) | |
| tree | 9f17554ef7a17f51384d7ce263224fd9077f00aa | |
| parent | af77db64d8acc4cba8d07b98a71616dde39511fa (diff) | |
rhbz#2171265 Report fatal InitApplicationServiceManager failures more reliably
For example, when initialization of the UNO type manager failed, any code run
between this SetBootstrapError and the HandleBootstrapErrors in Desktop::Main
which would need the type manager (e.g., to set a css::uno::Any) would have
caused a crash, so would have failed to print to std::cerr the sought-after
css::uno::Exception message. The mis-initialized process would most definitely
crash sooner or later anyway, so there's no harm in a controlled std::abort()
here (if that is even reached, and the process doesn't already crash in
HandleBootstrapErrors, after it has printed the relevant information to
std::cerr).
Change-Id: Ic5889aedec0908fa4b1e2966eb188508d0f92d26
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149323
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit a1faf14f74a62ea76141115538d7d30d90c9eeb6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149440
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
| -rw-r--r-- | desktop/source/app/app.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index d2eb5f3e2a9b..d38a65597ea9 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -28,6 +28,7 @@ #include <sal/config.h> +#include <cstdlib> #include <iostream> #include <string_view> @@ -458,7 +459,8 @@ void Desktop::Init() } catch (css::uno::Exception & e) { - SetBootstrapError( BE_UNO_SERVICEMANAGER, e.Message ); + HandleBootstrapErrors( BE_UNO_SERVICEMANAGER, e.Message ); + std::abort(); } // Check whether safe mode is enabled |