[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sw/source

[Markus Mohrhard]

 sw/source/uibase/app/apphdl.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0dc5bbc155311d6d687e4f29620c6652b988dd0d
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Sep 13 04:34:05 2016 +0200

    avoid crash with nullptr access
    
    e.g.
    http://crashreport.libreoffice.org/stats/crash_details/7d19c6e6-19cb-4ba0-a51f-7b7eef514ae1
    
    Change-Id: Ia27780d6fa29a7e4b0665192844afbd8a7471721
    Reviewed-on: https://gerrit.libreoffice.org/28854
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index ecfeb18..53db053 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -586,7 +586,7 @@ IMPL_LINK_NOARG_TYPED( SwMailMergeWizardExecutor, EndDialogHdl, Dialog&, void )
     default: // finish
         {
             SwMailMergeConfigItem* pMMConfig = m_pView->GetMailMergeConfigItem();
-            SwView* pSourceView = pMMConfig->GetSourceView();
+            SwView* pSourceView = pMMConfig ? pMMConfig->GetSourceView() : nullptr;
             if(pSourceView)
             {
                 pMMConfig->GetSourceView()->GetViewFrame()->GetFrame().Appear();