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

Caolán McNamara caolanm at redhat.com
Sun Jun 19 16:15:31 UTC 2016


 extensions/source/abpilot/datasourcehandling.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0e2a6561043c23b712b534fc3d33336d6bfcc50d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jun 19 17:14:43 2016 +0100

    coverity#1362777 Explicit null dereferenced
    
    Change-Id: I5db9cf469677b8509c19d6489472a4cf0babeca5

diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index a8afb62..ac9cbe6 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -368,7 +368,7 @@ namespace abp
                 SfxViewFrame* pFrame = SfxViewFrame::Current();
                 SfxObjectShell* pObjectShell = pFrame ? pFrame->GetObjectShell() : nullptr;
                 OUString aOwnURL = lcl_getOwnURL(pObjectShell);
-                if (aOwnURL.isEmpty() || !rSettings.bEmbedDataSource)
+                if (aOwnURL.isEmpty() || !rSettings.bEmbedDataSource || !pObjectShell)
                 {
                     // Cannot or should not embed.
                     xStorable->storeAsURL(m_pImpl->sName,Sequence<PropertyValue>());


More information about the Libreoffice-commits mailing list