diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-01-14 14:58:13 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-01-14 18:06:40 +0100 |
| commit | 6dc995f3dd6a8c74d6c9e248abe71f4fde4b3606 (patch) | |
| tree | 47357920ecf76823d8824601d809247b0073de85 /oox | |
| parent | 866fc4ddd3145f08d9cf2bce3cba7e3844c4f76d (diff) | |
ofz#5293 Null-dereference READ
Change-Id: Ie2f9127a903a07e26cf64672476cdfcc1f247eae
Reviewed-on: https://gerrit.libreoffice.org/47862
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 'oox')
| -rw-r--r-- | oox/source/vml/vmlshape.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
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; |