[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - winaccessibility/source

[Michael Meeks]

 winaccessibility/source/UAccCOM/MAccessible.cxx |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 5aa2c17ae7411c2bfe762e11e6514ce88f2bd053
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Mon Jan 27 12:08:55 2014 +0000

    fdo#73464 - guard against NULL / unset m_xAccessible.
    
    Change-Id: I3351acf18d334447336ee98761190fdff32d5b85
    Reviewed-on: https://gerrit.libreoffice.org/7690
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx
index 5fb1172..6ed3c4e 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -1434,6 +1434,9 @@ IMAccessible* CMAccessible::GetChildInterface(long dChildID)//for test
     }
     else
     {
+        if (!m_xAccessible.is())
+            return NULL;
+
         Reference<XAccessibleContext> const pRContext =
             m_xAccessible->getAccessibleContext();
         if( !pRContext.is() )
@@ -1948,6 +1951,9 @@ STDMETHODIMP CMAccessible:: get_groupPosition(long __RPC_FAR *groupLevel,long __
             return E_INVALIDARG;
         }
 
+        if (!m_xAccessible.is())
+            return E_FAIL;
+
         Reference<XAccessibleContext> const pRContext =
             m_xAccessible->getAccessibleContext();
         if(!pRContext.is())
@@ -3316,6 +3322,9 @@ STDMETHODIMP CMAccessible::get_attributes(/*[out]*/ BSTR *pAttr)
     ENTER_PROTECTED_BLOCK
     ISDESTROY()
 
+    if (!m_xAccessible.is())
+        return E_FAIL;
+
     Reference<XAccessibleContext> pRContext = m_xAccessible->getAccessibleContext();
     if( !pRContext.is() )
     {