vcl/osx/a11ywrapper.mm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
New commits: commit 2aad9a890cc414394a404ec10f032e62baa5ea54 Author: Patrick Luby <[email protected]> AuthorDate: Sun May 28 17:37:46 2023 -0300 Commit: Patrick Luby <[email protected]> CommitDate: Sun May 28 23:38:00 2023 +0200 Partial fix tdf#146626 Catch uncaught DisposedException Fix crash due to an uncaught DisposedException thrown by SwAccessibleParagraph::getTextRange() by using the same try/catch block in -[A11yWrapper accessibilityAttributeValue:] in -[A11yWrapper accessibilityAttributeValue:forParameter]. Change-Id: Ifcaec3eb2d76f32bddc56a1242f6d86f8b90f782 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152361 Tested-by: Jenkins Reviewed-by: Patrick Luby <[email protected]> diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm index 7cd6b70cc1f4..96de29e07f77 100644 --- a/vcl/osx/a11ywrapper.mm +++ b/vcl/osx/a11ywrapper.mm @@ -870,7 +870,15 @@ static std::ostream &operator<<(std::ostream &s, NSObject *obj) { SAL_INFO("vcl.a11y", "[" << self << " accessibilityAttributeValue:" << attribute << " forParameter:" << (static_cast<NSObject*>(parameter)) << "]"); SEL methodSelector = [ self selectorForAttribute: attribute asGetter: YES withGetterParameter: YES ]; if ( [ self respondsToSelector: methodSelector ] ) { - return [ self performSelector: methodSelector withObject: parameter ]; + try { + return [ self performSelector: methodSelector withObject: parameter ]; + } catch ( const DisposedException & ) { + mIsTableCell = NO; // just to be sure + [ AquaA11yFactory removeFromWrapperRepositoryFor: [ self accessibleContext ] ]; + return nil; + } catch ( const Exception & ) { + // empty + } } return nil; // TODO: to be completed }
