diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-02-24 09:02:39 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-02-24 11:04:20 +0100 |
| commit | dc61e9b836d5bf5842f9c582aa37a6d2d10a8cec (patch) | |
| tree | 4c8d8c915c4e82c35942863c68c67b96fa476dc3 | |
| parent | 7fe377593e77c4ada5725e5e0d9acfdacbd70f57 (diff) | |
ofz#20801 Null-deref
Change-Id: I2fd0c28499aff97622536754f1899b7b1f015989
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89326
Tested-by: Jenkins
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/qa/core/data/ooxml/pass/ofz20801-1.docx | bin | 0 -> 16286 bytes | |||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 2 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sw/qa/core/data/ooxml/pass/ofz20801-1.docx b/sw/qa/core/data/ooxml/pass/ofz20801-1.docx Binary files differnew file mode 100644 index 000000000000..0e1647ae27e1 --- /dev/null +++ b/sw/qa/core/data/ooxml/pass/ofz20801-1.docx 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; |