From 0d79e4c07a7a7328cc0bed1d7998317b634543d8 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Thu, 8 Oct 2015 14:30:13 +0200
Subject: tdf#94049 RTF import: add missing check for empty shape when popping
 state

Change-Id: I3c9a5f89df721618bb60b8932b69a371bb6f3ff1
---
 writerfilter/source/rtftok/rtfdocumentimpl.cxx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'writerfilter/source/rtftok')

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 1dd819752be0..a343a2a4679f 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -5410,9 +5410,12 @@ RTFError RTFDocumentImpl::popState()
         OSL_ASSERT(pShape.get());
         if (pShape.get())
             pShape->getAny() >>= xShape;
-        Mapper().startShape(xShape);
-        Mapper().props(pProperties);
-        Mapper().endShape();
+        if (xShape.is())
+        {
+            Mapper().startShape(xShape);
+            Mapper().props(pProperties);
+            Mapper().endShape();
+        }
         m_aObjectAttributes.clear();
         m_aOLEAttributes.clear();
         m_bObject = false;
-- 
cgit