diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-08-17 14:06:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-08-18 18:34:13 +0200 |
| commit | 40b2464bf346f1aeda44f719a301e2e60f4d0fd0 (patch) | |
| tree | 786057aff625b4a517ce828c8c8940c51ff05f22 /uui | |
| parent | f88af95552f9b46e1714964d84c447327b50ed40 (diff) | |
ignore exception in UUIInteractionHelper::handlerequest
otherwise I sometimes get a crash during
make UITest_sw_options
when an exception in configmgr goes up the stack and hits
the noexcept lamba in the vcl/
stuff that executes Application::PostUserEvent stuff
#1 in configmgr::RootAccess::getNode()
#2 in configmgr::Access::isValue()
#3 in configmgr::configuration_provider::(anonymous namespace)::Service::createInstanceWithArguments
#4 in non-virtual thunk to configmgr::configuration_provider::(anonymous namespace)::Service::createInstanceWithArguments
#5 in UUIInteractionHelper::getInteractionHandlerList
#6 in UUIInteractionHelper::tryOtherInteractionHandler
#6 in UUIInteractionHelper::handleRequest_impl
#7 in UUIInteractionHelper::handlerequest
Change-Id: Id90b4d27d3886984c64acdfee98d9c4696c3c03f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155766
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'uui')
| -rw-r--r-- | uui/source/iahndl.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index dfa3b96742d6..b6e88bcd3e40 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -141,9 +141,16 @@ void UUIInteractionHelper::handlerequest( = static_cast< UUIInteractionHelper * >(pInteractionHelper); bool bDummy = false; OUString aDummy; - pHND->bHandled - = pUUI->handleRequest_impl(pHND->m_rRequest, false, bDummy, aDummy); - pHND->set(); + try + { + pHND->bHandled + = pUUI->handleRequest_impl(pHND->m_rRequest, false, bDummy, aDummy); + pHND->set(); + } + catch (css::uno::Exception&) + { + TOOLS_WARN_EXCEPTION("uui", ""); + } } bool |