diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-08-17 22:32:52 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-08-21 21:24:44 +0200 |
| commit | 4704a686dcbada391db903fbb487a3fc5d60993e (patch) | |
| tree | c924445fc24dcdb66a2440c80669fc7b670be676 /writerfilter | |
| parent | 65f0172e2690930dc4c221784fe49185457fea83 (diff) | |
check for empty m_aStates
valgrind + bff
Change-Id: Ib818d508e10877a845b733c4aa223d1e2cbbc05e
(cherry picked from commit e2b9531e43d37677109aa13eb6e2ebf857961016)
Reviewed-on: https://gerrit.libreoffice.org/10959
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/qa/cppunittests/rtftok/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf | bin | 0 -> 4055 bytes | |||
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 4 |
2 files changed, 4 insertions, 0 deletions
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf b/writerfilter/qa/cppunittests/rtftok/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf Binary files differnew file mode 100644 index 000000000000..0925203f86ff --- /dev/null +++ b/writerfilter/qa/cppunittests/rtftok/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 9a711d83fca0..ca3482537274 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -457,6 +457,10 @@ void RTFDocumentImpl::checkNeedPap() if (m_bNeedPap) { m_bNeedPap = false; // reset early, so we can avoid recursion when calling ourselves + + if (m_aStates.empty()) + return; + if (!m_aStates.top().pCurrentBuffer) { writerfilter::Reference<Properties>::Pointer_t const pParagraphProperties( |