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

[Caolán McNamara]

 oox/source/vml/vmlshape.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 6dc995f3dd6a8c74d6c9e248abe71f4fde4b3606
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jan 14 14:58:13 2018 +0000

    ofz#5293 Null-dereference READ
    
    Change-Id: Ie2f9127a903a07e26cf64672476cdfcc1f247eae
    Reviewed-on: https://gerrit.libreoffice.org/47862
    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/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 112016d0849c..5e91bafe3f53 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -1410,9 +1410,11 @@ Reference< XShape > GroupShape::implConvertAndInsert( const Reference< XShapes >
     {
     }
 
+    uno::Reference<beans::XPropertySet> xPropertySet;
     if (!maTypeModel.maEditAs.isEmpty())
+        xPropertySet = uno::Reference<beans::XPropertySet>(xGroupShape, uno::UNO_QUERY);
+    if (xPropertySet.is())
     {
-        uno::Reference<beans::XPropertySet> xPropertySet(xGroupShape, uno::UNO_QUERY);
         uno::Sequence<beans::PropertyValue> aGrabBag;
         xPropertySet->getPropertyValue("InteropGrabBag") >>= aGrabBag;
         beans::PropertyValue aPair;