sw/source/core/text/itratr.cxx | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 04cdfa7aa0fea15c1fc737631c62260d8a9c2312
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Jul 22 11:28:55 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Jul 22 15:50:13 2019 +0200
cid#1448263 Dereference after null check
Change-Id: I48f5bbd0f51bed68a3a1772e17c6570248545370
Reviewed-on: https://gerrit.libreoffice.org/76109
Reviewed-by: Michael Stahl <michael.st...@cib.de>
Tested-by: Jenkins
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index 9b1f0236ccf2..77ded3fe3edf 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -339,6 +339,7 @@ bool SwAttrIter::Seek(TextFrameIndex const nNewPos)
// items at all; it can only apply a previously effective item.
// So do this by recreating the font from scratch.
// Apply new para items:
+ assert(m_pMergedPara);
InitFontAndAttrHandler(*m_pMergedPara->pParaPropsNode, *newPos.first,
m_pMergedPara->mergedText, nullptr, nullptr);
// reset to next
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
