sw/source/filter/html/htmltab.cxx | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 816fd52f32f1c8bec0d7d902cb13a26499a27c35
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Dec 19 11:19:24 2017 +0000
ofz: Null-deref
Change-Id: I0194de1a136375f131c2a7c316e1a64435637e4e
Reviewed-on: https://gerrit.libreoffice.org/46785
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/filter/html/htmltab.cxx
b/sw/source/filter/html/htmltab.cxx
index 3a49139fc00e..f1a869b55b14 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -2712,7 +2712,13 @@ const SwStartNode *SwHTMLParser::InsertTableSection(
sal_uInt16 nPoolId )
const SwStartNode *pStNd;
if (m_xTable->m_bFirstCell)
{
- pNd->GetTextNode()->ChgFormatColl( pColl );
+ SwTextNode* pTextNd = pNd->GetTextNode();
+ if (!pTextNd)
+ {
+ eState = SvParserState::Error;
+ return nullptr;
+ }
+ pTextNd->ChgFormatColl(pColl);
m_xTable->m_bFirstCell = false;
pStNd = pNd->FindTableBoxStartNode();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
