summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-12-19 11:19:24 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-12-19 14:51:13 +0100
commit816fd52f32f1c8bec0d7d902cb13a26499a27c35 (patch)
tree90a0bf6b1ba24333c4db761975d7211eb5932a7b
parentced2f083483e2d60c077177b8a359d310e0976c3 (diff)
ofz: Null-deref
Change-Id: I0194de1a136375f131c2a7c316e1a64435637e4e Reviewed-on: https://gerrit.libreoffice.org/46785 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sw/source/filter/html/htmltab.cxx8
1 files changed, 7 insertions, 1 deletions
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();
}