[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - svx/source

[Caolán McNamara]

 svx/source/accessibility/AccessibleShape.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bc12c38f0c8fd4d2a1c13a72dc27f49ff44b48c4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 18 11:09:01 2017 +0100

    potential deref of empty xStateSet
    
    Change-Id: I83d876b0d966b18cdf85249b7e856e4e4f4dec27
    Reviewed-on: https://gerrit.libreoffice.org/43488
    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>
    (cherry picked from commit 811e636d920ee96e7ebd120b3931cb3da43d0143)
    Reviewed-on: https://gerrit.libreoffice.org/43548
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index ffc2a6bc5f2e..3a3af9f9d34d 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -461,7 +461,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
             xStateSet.set( new ::utl::AccessibleStateSetHelper (*pStateSet));
         }
     }
-    if (!bDisposed && mpParent && mpParent->IsDocumentSelAll())
+    if (!bDisposed && xStateSet.is() && mpParent && mpParent->IsDocumentSelAll())
     {
         ::utl::AccessibleStateSetHelper* pStateSet =
             static_cast< ::utl::AccessibleStateSetHelper*>(xStateSet.get());