[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - oox/source

[Libreoffice Gerrit user]

 oox/source/drawingml/shape.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit eb20fd85ddd25026a1b814d75fac6b5aa4ec0ef7
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Aug 5 10:33:02 2018 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Aug 20 13:49:41 2018 +0200

    coverity#1438224 Dereference null return value
    
    Change-Id: I794c54867b83d738a075f9fa0dbd31fe62de49b9
    Reviewed-on: https://gerrit.libreoffice.org/58610
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit e5c3b913cc5b656710677e3597079e0cd5040f82)
    Reviewed-on: https://gerrit.libreoffice.org/58842
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 5483dcc06ff1..984b159e3dfa 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -521,6 +521,7 @@ static inline void lcl_createPresetShape( uno::Reference<drawing::XShape>& xShap
                 eAdjust = pParagraph->getProperties().getParaAdjust().get();
             xSet->setPropertyValue( "ParaAdjust", uno::makeAny( eAdjust ) );
             SvxShape* pShape = SvxShape::getImplementation( xShape );
+            assert(pShape);
             SdrTextHorzAdjust eHorzAdjust = lcl_convertAdjust( eAdjust );
             pShape->GetSdrObject()->SetMergedItem( SdrTextHorzAdjustItem( eHorzAdjust ) );
         }