diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-07-27 21:23:49 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-07-31 12:03:56 +0200 |
| commit | cf960d36a97609178f5e72abf71b803f0d14404e (patch) | |
| tree | 1899330cd2ec6dc88bdb93065273577a4dcbf36d | |
| parent | 36032d8f94bb23abe9651c284bc9f8328c9360ba (diff) | |
ofz#2759 null dereference
(cherry picked from commit 6f5841e60ed29ae2577e63623edacc9fe1467ba5)
Change-Id: I23671f0cea592c92a05b34b3cf284a47a73962b1
Reviewed-on: https://gerrit.libreoffice.org/40506
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 26222c3baca76eaed5f45dde4592a059e0e4a85d)
| -rw-r--r-- | sw/source/filter/ww8/ww8par2.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index c6b8ba08c398..869e6e86c4d1 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -435,14 +435,16 @@ long SwWW8ImplReader::Read_Footnote(WW8PLCFManResult* pRes) if (eEDN == pRes->nSprmId) { aDesc.meType = MAN_EDN; - if (m_pPlcxMan->GetEdn()) - aDesc.mbAutoNum = 0 != *static_cast<short const *>(m_pPlcxMan->GetEdn()->GetData()); + WW8PLCFx_SubDoc* pEndNote = m_pPlcxMan->GetEdn(); + if (const void* pData = pEndNote ? pEndNote->GetData() : nullptr) + aDesc.mbAutoNum = 0 != *static_cast<short const*>(pData); } else { aDesc.meType = MAN_FTN; - if (m_pPlcxMan->GetFootnote()) - aDesc.mbAutoNum = 0 != *static_cast<short const *>(m_pPlcxMan->GetFootnote()->GetData()); + WW8PLCFx_SubDoc* pFootNote = m_pPlcxMan->GetFootnote(); + if (const void* pData = pFootNote ? pFootNote->GetData() : nullptr) + aDesc.mbAutoNum = 0 != *static_cast<short const*>(pData); } aDesc.mnStartCp = pRes->nCp2OrIdx; |