[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-2' - sd/source

Mike Kaganski (via logerrit) logerrit at kemper.freedesktop.org
Wed Mar 11 12:57:26 UTC 2020


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

New commits:
commit afc8459918f92a3b55ed5de3daceb5c0cd2a5cb8
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Mon Mar 2 12:37:17 2020 +0300
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Wed Mar 11 13:56:55 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/+/89798
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit 8ebb41ba032ac341f1b0e8fcfe79581488ef75bd)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89915
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index a48721c3f888..c1c112008b05 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -243,7 +243,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() );


More information about the Libreoffice-commits mailing list