From 5f6463d0ddc138672428a770e959a448246e265f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 18 Jan 2018 15:50:23 +0000 Subject: coverity#1427648 Dereference after null check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib4be7b819a5ba68d78d98d8ae05d755898f3cad1 Reviewed-on: https://gerrit.libreoffice.org/48136 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit 432f4369cdb62fd05abbde50804ff4e1d5011f39) --- sw/source/uibase/shells/textsh1.cxx | 9 ++++++--- 1 file 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 pRequest(new SfxRequest(*pReq)); - pReq->Ignore(); // the 'old' request is not relevant any more - + std::shared_ptr 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) { -- cgit v1.2.1