sw/qa/core/data/ooxml/pass/ofz20801-1.docx |binary
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 2 ++
2 files changed, 2 insertions(+)
New commits:
commit dc61e9b836d5bf5842f9c582aa37a6d2d10a8cec
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Feb 24 09:02:39 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Feb 24 11:04:20 2020 +0100
ofz#20801 Null-deref
Change-Id: I2fd0c28499aff97622536754f1899b7b1f015989
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89326
Tested-by: Jenkins
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/qa/core/data/ooxml/pass/ofz20801-1.docx
b/sw/qa/core/data/ooxml/pass/ofz20801-1.docx
new file mode 100644
index 000000000000..0e1647ae27e1
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/ofz20801-1.docx differ
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index d10f1e8776c4..7dcbae415ff2 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -1195,6 +1195,8 @@ void DomainMapperTableHandler::endTable(unsigned int
nestedTableLevel, bool bTab
for (size_t nCell = 0; nCell <
m_aTableRanges[nRow].size(); ++nCell)
{
auto rStartPara = m_aTableRanges[nRow][nCell][0];
+ if (!rStartPara.is())
+ continue;
auto rEndPara = m_aTableRanges[nRow][nCell][1];
uno::Reference<text::XTextRangeCompare>
xTextRangeCompare(rStartPara->getText(), uno::UNO_QUERY);
bool bApply = false;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
