[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - writerfilter/qa writerfilter/source

[Caolán McNamara]

 
writerfilter/qa/cppunittests/rtftok/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
 |binary
 writerfilter/source/rtftok/rtfdocumentimpl.cxx                                 
             |    4 ++++
 2 files changed, 4 insertions(+)

New commits:
commit 33f2265a297a51d1b341f583951d8ed46f9155e7
Author: Caolán McNamara <caol...@redhat.com>
Date:   Sun Aug 17 22:32:52 2014 +0100

    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 <dtar...@redhat.com>
    Tested-by: David Tardon <dtar...@redhat.com>

diff --git 
a/writerfilter/qa/cppunittests/rtftok/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
 
b/writerfilter/qa/cppunittests/rtftok/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
new file mode 100644
index 0000000..0925203
Binary files /dev/null and 
b/writerfilter/qa/cppunittests/rtftok/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
 differ
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 9a711d8..ca34825 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(

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits