diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-04-10 16:21:33 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-04-10 18:06:16 +0200 |
| commit | b5a79a6e81086df034632716110124af6ee35109 (patch) | |
| tree | 7aa562f3b46f06cf6803ad2841d889a165da1c12 /sw/source | |
| parent | 125c453d8e2826ddaf569ff80e8205e8500b5df1 (diff) | |
null-deref of GetObjectShell
Change-Id: Ie0c46635d9ad01a17b5d5028ed5f983fd8c5ee74
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92046
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/uibase/app/apphdl.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 782445027c8c..e8bfe164cdca 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -158,7 +158,8 @@ void SwModule::StateOther(SfxItemSet &rSet) break; case FN_MAILMERGE_WIZARD: { - if (GetObjectShell()->isExportLocked()) + SfxObjectShell* pObjectShell = GetObjectShell(); + if (pObjectShell && pObjectShell->isExportLocked()) rSet.DisableItem(nWhich); break; } |