[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - connectivity/source

[Julien Nabet (via logerrit)]

 connectivity/source/commontools/TTableHelper.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 5dae252e76da9c95049ba8124422a1f7b2f10596
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Thu Nov 26 23:12:46 2020 +0100
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Fri Nov 27 23:01:48 2020 +0100

    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
    (cherry picked from commit 4335810b00abb9b00a9d81caa5ffe09a3ea927fd)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106742
    Reviewed-by: Lionel Mamane <lionel at mamane.lu>
    Tested-by: Jenkins

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() )