diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-09-13 04:09:21 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-09-13 05:40:58 +0000 |
| commit | a46076245ca6a85712f51187553f5abd3f0aa79a (patch) | |
| tree | ab0ad793b7bddc1d368da0e1a9633144e10dca34 /sw/source/uibase/app | |
| parent | e006b6889ef782e2f2af58c981f013262d52066d (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'sw/source/uibase/app')
| -rw-r--r-- | sw/source/uibase/app/apphdl.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 0610f8cc587d..22eeb3dd072e 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(); |