sw/source/uibase/app/apphdl.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit a46076245ca6a85712f51187553f5abd3f0aa79a Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Tue Sep 13 04:09:21 2016 +0200 avoid crash with nullptr access e.g. http://crashreport.libreoffice.org/stats/crash_details/7d19c6e6-19cb-4ba0-a51f-7b7eef514ae1 Change-Id: I97c9da78bc30b730843753da677574ae247cb430 Reviewed-on: https://gerrit.libreoffice.org/28853 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com> diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 0610f8c..22eeb3d 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -597,7 +597,7 @@ IMPL_LINK_NOARG_TYPED( SwMailMergeWizardExecutor, EndDialogHdl, Dialog&, void ) default: // finish { std::shared_ptr<SwMailMergeConfigItem> xMMConfig = m_pView->GetMailMergeConfigItem(); - SwView* pSourceView = xMMConfig->GetSourceView(); + SwView* pSourceView = xMMConfig.get() ? xMMConfig->GetSourceView() : nullptr; if(pSourceView) { xMMConfig->GetSourceView()->GetViewFrame()->GetFrame().Appear(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits