[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - comphelper/source

[Xisco Fauli (via logerrit)]

 comphelper/source/misc/SelectionMultiplex.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a8b4523905bd5ed8ed06150927b4af3cdf40a7ba
Author:     Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Fri Jan 13 11:42:38 2023 +0100
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon Jan 16 11:11:52 2023 +0000

    comphelper: check for nullptr
    
    See 
https://crashreport.libreoffice.org/stats/signature/comphelper::OSelectionChangeMultiplexer::dispose()
    
    Regression from 9931d6b1fb0406e16d56e186812884511738dcfa
    "tdf#150575: REPORTBUILDER: Crash when closing report when used report
    navigator"
    
    Change-Id: I6e4ada368254879d983f80026e9b42ddb4186c51
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145461
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    (cherry picked from commit e4e2c7a63217c797802045d326f732296e0af918)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145443
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/comphelper/source/misc/SelectionMultiplex.cxx 
b/comphelper/source/misc/SelectionMultiplex.cxx
index e4fb824a0ba3..438eaa80d718 100644
--- a/comphelper/source/misc/SelectionMultiplex.cxx
+++ b/comphelper/source/misc/SelectionMultiplex.cxx
@@ -100,7 +100,8 @@ void OSelectionChangeMultiplexer::dispose()
     osl_atomic_increment(&m_refCount);
     {
         Reference< XSelectionChangeListener> xPreventDelete(this);
-        m_xSet->removeSelectionChangeListener(xPreventDelete);
+        if(m_xSet.is())
+            m_xSet->removeSelectionChangeListener(xPreventDelete);
     }
     osl_atomic_decrement(&m_refCount);
 }