From bf5e0dc9bd54069f57f41de8746dc29d0ec41061 Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Wed, 3 Jun 2020 14:07:39 +0200 Subject: tdf#133633 winaccessibility: Add null check The call to 'AccObjectManagerAgent::GetIAccessibleFromResID' may set 'pImAcc' to nullptr here (s. 'AccObjectWinManager::GetIAccessibleFromResID', which is called from there), so handle that case gracefully. Change-Id: I0dbd48974fd012ff086835b147cd9b9cfc8a052b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95430 Tested-by: Jenkins Reviewed-by: Michael Weghorn (cherry picked from commit f5f9cac0c5f04246718c438b4673b36e803fda29) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95420 Reviewed-by: Michael Stahl --- winaccessibility/source/UAccCOM/MAccessible.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx index d681c38a793c..6a844f8d7ce6 100644 --- a/winaccessibility/source/UAccCOM/MAccessible.cxx +++ b/winaccessibility/source/UAccCOM/MAccessible.cxx @@ -786,6 +786,10 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_accFocus(VARIANT *pvarChild) { IMAccessible* pIMAcc = nullptr; g_pAgent->GetIAccessibleFromResID(m_dFocusChildID,&pIMAcc); + if (pIMAcc == nullptr) + { + return E_FAIL; + } pIMAcc->AddRef(); pvarChild->vt = VT_DISPATCH; pvarChild->pdispVal = pIMAcc; -- cgit v1.2.3