summaryrefslogtreecommitdiff
path: root/winaccessibility
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-12-12 14:47:47 +0100
committerMichael Stahl <mstahl@redhat.com>2013-12-13 19:47:43 +0100
commitfebd4d9d3c97d0dccf4dc4c5217f4db668f1e9ce (patch)
treec466a9edfc846cea26344a9a637a874fd43a958f /winaccessibility
parent3ba417fe93fd25d1a4c2f3d1cd368e9bd93882d4 (diff)
winaccessibility: GetChildInterface may return 0
Change-Id: I950072d22cd315d1898b76a2c345121d31d432c4 (cherry picked from commit 506bab8f62c585380e607b91ab80c939dc99851c)
Diffstat (limited to 'winaccessibility')
-rw-r--r--winaccessibility/source/UAccCOM/MAccessible.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx
index e3487b3f7122..08129327048d 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -378,8 +378,10 @@ STDMETHODIMP CMAccessible::get_accChild(VARIANT varChild, IDispatch **ppdispChil
return S_OK;
}
*ppdispChild = GetChildInterface(varChild.lVal);
+ if (!(*ppdispChild))
+ return S_FALSE;
(*ppdispChild)->AddRef();
- return (*ppdispChild)?S_OK:S_FALSE;
+ return S_OK;
}
return S_FALSE;