summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-01-18 15:50:23 +0000
committerAron Budea <aron.budea@collabora.com>2019-03-14 13:15:11 +0100
commit5f6463d0ddc138672428a770e959a448246e265f (patch)
treefb2c6acfe16650217a776a123e8f396f16e3b382
parent7d291e0593485a118f5792a0daea8d3e94d743a8 (diff)
coverity#1427648 Dereference after null checkcp-6.0-26
Change-Id: Ib4be7b819a5ba68d78d98d8ae05d755898f3cad1 Reviewed-on: https://gerrit.libreoffice.org/48136 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 432f4369cdb62fd05abbde50804ff4e1d5011f39)
-rw-r--r--sw/source/uibase/shells/textsh1.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 5b52a95ffa41..cf789346a410 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -201,9 +201,12 @@ void sw_CharDialog(SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot, const
if (bUseDialog)
{
- std::shared_ptr<SfxRequest> pRequest(new SfxRequest(*pReq));
- pReq->Ignore(); // the 'old' request is not relevant any more
-
+ std::shared_ptr<SfxRequest> pRequest;
+ if (pReq)
+ {
+ pRequest.reset(new SfxRequest(*pReq));
+ pReq->Ignore(); // the 'old' request is not relevant any more
+ }
pDlg->StartExecuteAsync([pDlg, &rWrtSh, pCoreSet, bSel, bSelectionPut, pRequest](sal_Int32 nResult){
if (nResult == RET_OK)
{