[Libreoffice-commits] core.git: sw/qa writerfilter/source

[Caolán McNamara]

 sw/qa/core/data/rtf/pass/forcepoint-2.rtf   |binary
 writerfilter/source/rtftok/rtfsdrimport.cxx |    3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c05681341002742991a41c3def760c67e5de4773
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 8 20:59:44 2018 +0000

    forcepoint #20 pop on empty stack
    
    Thanks to Antti Levomäki and Christian Jalio from Forcepoint.
    
    Change-Id: I3098c5d32d8f97dff4c620e054acde1ba1b6adf3
    Reviewed-on: https://gerrit.libreoffice.org/50972
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/qa/core/data/rtf/pass/forcepoint-2.rtf b/sw/qa/core/data/rtf/pass/forcepoint-2.rtf
new file mode 100755
index 000000000000..895e6848cfbf
Binary files /dev/null and b/sw/qa/core/data/rtf/pass/forcepoint-2.rtf differ
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 6f712d9a75c0..b15b79d2ac6a 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -132,7 +132,8 @@ void RTFSdrImport::popParent()
 {
     if (!m_aGraphicZOrderHelpers.empty())
         m_aGraphicZOrderHelpers.pop();
-    m_aParents.pop();
+    if (!m_aParents.empty())
+        m_aParents.pop();
 }
 
 void RTFSdrImport::resolveDhgt(uno::Reference<beans::XPropertySet> const& xPropertySet,