diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2014-01-27 12:08:55 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2014-01-27 12:15:20 +0000 |
| commit | 44064d1a342ba00d128fac3d9fbe52e29f496b73 (patch) | |
| tree | 807b469e9779cc20dc2733b967aa7e58a2afe445 /winaccessibility | |
| parent | 58dfc97ca697875c36b7ddf14f5505a93d7b9cf8 (diff) | |
fdo#73464 - guard against NULL / unset m_xAccessible.
Change-Id: I3351acf18d334447336ee98761190fdff32d5b85
Diffstat (limited to 'winaccessibility')
| -rw-r--r-- | winaccessibility/source/UAccCOM/MAccessible.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx index 5a626428ef87..6df385f06cd3 100644 --- a/winaccessibility/source/UAccCOM/MAccessible.cxx +++ b/winaccessibility/source/UAccCOM/MAccessible.cxx @@ -1435,6 +1435,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() ) @@ -1949,6 +1952,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()) @@ -3317,6 +3323,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() ) { |