summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-03-08 20:59:44 +0000
committerCaolán McNamara <caolanm@redhat.com>2018-03-09 10:08:25 +0100
commitc05681341002742991a41c3def760c67e5de4773 (patch)
tree6140d6367661e399345a6af60a6aff3b6f5f3d1c /writerfilter
parent7ec97313c178bcb100842d02baace15264fcc314 (diff)
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@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/rtftok/rtfsdrimport.cxx3
1 files changed, 2 insertions, 1 deletions
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,