From 4335810b00abb9b00a9d81caa5ffe09a3ea927fd Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Thu, 26 Nov 2020 23:12:46 +0100 Subject: [PATCH] tdf#137745: crash, when deleting tables and changed relationship isn't changed bt here: https://bugs.documentfoundation.org/attachment.cgi?id=166782 some explanations here: https://bugs.documentfoundation.org/show_bug.cgi?id=137745#c8 Change-Id: I1d9dc8d2e3ad7e3e36c4687cb9b2c5990f2d2c8d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106715 Tested-by: Jenkins Reviewed-by: Lionel Mamane --- connectivity/source/commontools/TTableHelper.cxx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx index e86af9673052..03724d669704 100644 --- a/connectivity/source/commontools/TTableHelper.cxx +++ b/connectivity/source/commontools/TTableHelper.cxx @@ -72,6 +72,11 @@ public: } virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override { + // tdf#137745, perhaps connectivity::OTableHelper::disposing() has been called + // which called OTableContainerListener::clear(), so m_pComponent may be null + if (m_pComponent == nullptr) + return; + OUString sName; Event.Accessor >>= sName; if ( m_aRefNames.find(sName) != m_aRefNames.end() )