sw/source/core/doc/docfmt.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 87b2c7be6d761962694af813ce590d88fb21ff40 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Mon Jul 22 11:19:48 2019 +0100 Commit: Michael Stahl <michael.st...@cib.de> CommitDate: Mon Jul 22 16:14:06 2019 +0200 cid#1448262 Dereference before null check Change-Id: I998e1c463d86aeb53b93ece58b46b2b6b7cd6360 Reviewed-on: https://gerrit.libreoffice.org/76108 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.st...@cib.de> diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index 10bbb0d097c8..0c69d1d4a9a6 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -106,7 +106,7 @@ static bool lcl_RstAttr( const SwNodePtr& rpNd, void* pArgs ) { const sw::DocumentContentOperationsManager::ParaRstFormat* pPara = static_cast<sw::DocumentContentOperationsManager::ParaRstFormat*>(pArgs); SwContentNode* pNode = rpNd->GetContentNode(); - if (pPara->pLayout && pPara->pLayout->IsHideRedlines() + if (pPara && pPara->pLayout && pPara->pLayout->IsHideRedlines() && pNode && pNode->GetRedlineMergeFlag() == SwNode::Merge::Hidden) { return true; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits