diff options
| author | Eike Rathke <erack@redhat.com> | 2016-10-06 13:48:41 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-10-06 13:57:34 +0200 |
| commit | 6a5a7d24974378ed54c83a9c618b48825a52fafa (patch) | |
| tree | c6e1c39e701f7dd3f03f87999e50cfb4b1d9bbc6 | |
| parent | c8c4f28f1131f4e993f5cc7693077457b03b4400 (diff) | |
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
| -rw-r--r-- | sc/source/ui/app/transobj.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 138abae2fc52..aa5df7fbec83 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(); |