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

[Caolán McNamara]

 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 996fbf1cefff1d991e4c89919797e5f0daeaafa9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 27 21:02:53 2017 +0000

    ofz#4814 asserts and Null-dereference on broken shape
    
    the attempt is made, but the shape isn't there, so m_bShapeSent
    wasn't set, so it will get called again and the markstacks are popped
    to many times. Lets set it when the effort is made.
    
    Change-Id: I58dfe11316112cca6ff69ea518ed0b4908f25d6c
    Reviewed-on: https://gerrit.libreoffice.org/47106
    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/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 138954023f89..9379fa95f3b4 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1662,12 +1662,12 @@ void OOXMLFastContextHandlerShape::sendShape( Token_t Element )
         awt::Point aPosition = mpStream->getPositionOffset();
         mrShapeContext->setPosition(aPosition);
         uno::Reference<drawing::XShape> xShape(mrShapeContext->getShape());
+        m_bShapeSent = true;
         if (xShape.is())
         {
             OOXMLValue::Pointer_t
                 pValue(new OOXMLShapeValue(xShape));
             newProperty(NS_ooxml::LN_shape, pValue);
-            m_bShapeSent = true;
 
             bool bIsPicture = Element == ( NMSP_dmlPicture | XML_pic );