[Libreoffice-commits] core.git: Branch 'distro/vector/vector-5.4' - 2 commits - desktop/qa sw/qa writerfilter/source

[Caolán McNamara (via logerrit)]

 desktop/qa/desktop_lib/test_desktop_lib.cxx       |    2 +-
 sw/qa/core/data/ooxml/fail/ofz9934-1.docx         |binary
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    5 +++--
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit a878015aebafa5d23c147e3641ed2ded2ac2a6bb
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Aug 17 08:47:19 2018 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Mar 19 13:38:17 2020 +0100

    ofz#9934 null deref
    
    Reviewed-on: https://gerrit.libreoffice.org/59249
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    (cherry picked from commit 4fb7390956a193e00c1b599129b89933c41f98ae)
    
    Change-Id: I6833ad8a556b561a37e468da8845914cabfac4c5

diff --git a/sw/qa/core/data/ooxml/fail/ofz9934-1.docx b/sw/qa/core/data/ooxml/fail/ofz9934-1.docx
new file mode 100644
index 000000000000..b97afaee8d3f
Binary files /dev/null and b/sw/qa/core/data/ooxml/fail/ofz9934-1.docx differ
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 1645e447fabb..fa8d662ea5a0 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1489,8 +1489,9 @@ void DomainMapper_Impl::appendOLE( const OUString& rStreamName, const OLEHandler
         if (!m_aAnchoredStack.empty())
             m_aAnchoredStack.top( ).bToRemove = true;
         RemoveLastParagraph();
-        m_aTextAppendStack.pop();
-
+        SAL_WARN_IF(m_aTextAppendStack.empty(), "writerfilter.dmapper", "no text stack");
+        if (!m_aTextAppendStack.empty())
+            m_aTextAppendStack.pop();
 
         appendTextContent( xOLE, uno::Sequence< beans::PropertyValue >() );
 
commit 37740148ab1ed98ef321bd8f785baa6ec592c749
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu Mar 19 10:59:28 2020 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Mar 19 12:17:05 2020 +0100

    desktop: disable testGetFontSubset()
    
    This fails with:
    
    cppunittester: svx/source/dialog/charmap.cxx:1648: void SubsetMap::InitList(): Assertion `eBlockStart == eBlockEnd && eBlockStart == eBlock' failed.
    
    And probably ~always did, just I ran the tests in an assert-disabled
    build previously.
    
    Disable the test so other test failures can be noticed fast. (Especially
    that the test is not too relevant on this branch, it's for Online.)
    
    [ The test works on master, so just disable this on this branch only. ]
    
    Change-Id: Ib29f76d049503e5b8584f6aed4bc85e88558f9e7

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 79ec0ba54e3b..af4a1bb41842 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -145,7 +145,7 @@ public:
     CPPUNIT_TEST(testRedlineCalc);
     CPPUNIT_TEST(testPaintPartTile);
     CPPUNIT_TEST(testWriterCommentInsertCursor);
-    CPPUNIT_TEST(testGetFontSubset);
+    //CPPUNIT_TEST(testGetFontSubset);
     CPPUNIT_TEST(testCommentsWriter);
     CPPUNIT_TEST(testCommentsCalc);
     CPPUNIT_TEST(testCommentsImpress);