[Libreoffice-commits] core.git: Branch 'libreoffice-6-0-0' - sfx2/source

[Michael Meeks]

 sfx2/source/doc/sfxbasemodel.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 877d94e5e90bf6599a30aa33e8504e4bcd332654
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Tue Jan 16 13:31:37 2018 +0000

    tdf#113755 - avoid null ptr de-reference during shutdown.
    
    Why the PostUserEvent's that should do the XTDataObject async destroy
    are not completed by here, is rather unclear; but - de-referencing
    NULL is not a great thing to do during shutdown.
    
    http://crashreport.libreoffice.org/stats/crash_details/a7d8fd19-0512-4292-b3a0-140dcff204c8
    
    Change-Id: I3f294379f07f4cfc0106c1b5fc5e705c41e78b03
    Reviewed-on: https://gerrit.libreoffice.org/48007
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    (cherry picked from commit ad7e6339e5e5cf465a2ef25442099eb59f1a0deb)
    Reviewed-on: https://gerrit.libreoffice.org/48179
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 56ab68ea97df..2403ca27d212 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -934,6 +934,13 @@ OUString SAL_CALL SfxBaseModel::getURL()
 Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs()
 {
     SfxModelGuard aGuard( *this );
+
+    if (!SfxApplication::Get()) // tdf#113755
+    {
+        SAL_WARN("sfx.appl", "Unexpected operations on model");
+        return m_pData->m_seqArguments;
+    }
+
     if ( m_pData->m_pObjectShell.is() )
     {
         Sequence< beans::PropertyValue > seqArgsNew;