[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sd/source

[Mike Kaganski (via logerrit)]

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

New commits:
commit 18d2e641a839f730d2db7a61f010281280d5cf96
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Mon Mar 2 12:37:17 2020 +0300
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Mar 5 16:48:39 2020 +0100

    tdf#118893: avoid nullptr dereference
    
    Change-Id: I56ada18348ed1b1ebe5e1d6f000391965d822b4a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89815
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit 788ffc0360e44c54947bdead6d1eb368e5283915)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89911
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 14543f4f1a76..1e1b234fdcc0 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -247,7 +247,7 @@ void SdTransferable::CreateData()
 
         SdPage* pPage = mpSdDrawDocument->GetSdPage(0, PageKind::Standard);
 
-        if( 1 == pPage->GetObjCount() )
+        if( pPage && 1 == pPage->GetObjCount() )
             CreateObjectReplacement( pPage->GetObj( 0 ) );
 
         mpVDev = VclPtr<VirtualDevice>::Create( *Application::GetDefaultDevice() );