bin/oss-fuzz-build.sh | 2 +- sw/source/filter/html/htmltab.cxx | 3 +++ sw/source/filter/html/swhtml.cxx | 8 ++++---- 3 files changed, 8 insertions(+), 5 deletions(-)
New commits: commit eb9f4b407164ff23f7f62022feb285e0f158a962 Author: Caolán McNamara <[email protected]> Date: Tue Dec 12 09:19:04 2017 +0000 use afl html_tags as htmlfuzzer dictionary Change-Id: Ic179f835d4d67a9856381b87f7fbc8b144bf595d diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh index c9cb2f0f1b8f..10759eb31cd2 100755 --- a/bin/oss-fuzz-build.sh +++ b/bin/oss-fuzz-build.sh @@ -43,4 +43,4 @@ cp $SRC/xml.dict $OUT/fodsfuzzer.dict cp $SRC/xml.dict $OUT/fodpfuzzer.dict cp $SRC/xml.dict $OUT/fodgfuzzer.dict cp $SRC/xml.dict $OUT/mmlfuzzer.dict -#cp $SRC/html_tags.dict $OUT/htmlfuzzer.dict +cp $SRC/html_tags.dict $OUT/htmlfuzzer.dict commit aa2480daae4b87d37e9c7ce226dd0082a54fc254 Author: Caolán McNamara <[email protected]> Date: Tue Dec 12 09:10:59 2017 +0000 ofz: Null-deref Change-Id: I83560b28d30d76c48b2283940e90e1b2c2bc9db5 diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 4b4569117e50..84e7b3b31a2f 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -2737,6 +2737,9 @@ const SwStartNode *SwHTMLParser::InsertTableSection( sal_uInt16 nPoolId ) m_xTable->IncBoxCount(); } + if (!pStNd) + throw std::runtime_error("missing table start node"); + return pStNd; } commit 581820cbb0542f5d1401c1fac4bfb6efee72937c Author: Caolán McNamara <[email protected]> Date: Mon Dec 11 21:17:50 2017 +0000 ofz: Null-deref Change-Id: I5c9925e4985e342537affe8048058f6afc886e6b diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 5c2ce5047d0f..1d865e761e59 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -2087,11 +2087,11 @@ bool SwHTMLParser::AppendTextNode( SwHTMLAppendMode eMode, bool bUpdateNum ) if( !m_aParaAttrs.empty() ) m_aParaAttrs.clear(); - if( AM_SPACE==eMode || AM_NOSPACE==eMode ) - { - SwTextNode *pTextNode = - m_pPam->GetPoint()->nNode.GetNode().GetTextNode(); + SwTextNode *pTextNode = (AM_SPACE==eMode || AM_NOSPACE==eMode) ? + m_pPam->GetPoint()->nNode.GetNode().GetTextNode() : nullptr; + if (pTextNode) + { const SvxULSpaceItem& rULSpace = static_cast<const SvxULSpaceItem&>(pTextNode->SwContentNode::GetAttr( RES_UL_SPACE ));
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
