[Libreoffice-commits] core.git: sc/source

[Eike Rathke]

 sc/source/ui/app/transobj.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6a5a7d24974378ed54c83a9c618b48825a52fafa
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Oct 6 13:48:41 2016 +0200

    ScTransferObj::ObjectReleased: prevent ScModule nullptr access
    
    This happened when in the debugger sitting on a break, switching to the
    application, hitting Ctrl+Q to quit, the Gnome "application not
    responding" query box appeared, then continuing in the debugger,
    answered "quit without saving" in the application while the Gnome query
    box was still displayed (which usually disappears automatically if the
    application runs again). Apparently some race condition between system
    clipboard and the application being torn down.
    
    Change-Id: I6accc29a14dec15f9fc7c2aeadf57475de148b2d

diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 138abae..aa5df7f 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -491,7 +491,7 @@ bool ScTransferObj::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* p
 void ScTransferObj::ObjectReleased()
 {
     ScModule* pScMod = SC_MOD();
-    if ( pScMod->GetClipData().pCellClipboard == this )
+    if ( pScMod && pScMod->GetClipData().pCellClipboard == this )
         pScMod->SetClipObject( nullptr, nullptr );
 
     TransferableHelper::ObjectReleased();