Title: [287126] trunk/Source/WebCore
Revision
287126
Author
andresg...@apple.com
Date
2021-12-15 23:08:17 -0800 (Wed, 15 Dec 2021)

Log Message

Fix for crash in AXIsolatedObject::textMarkerRangeForNSRange.
https://bugs.webkit.org/show_bug.cgi?id=234377
<rdar://problem/86553198>

Reviewed by Chris Fleizach.

Covered by accessibility/mac/textmarker-range-for-range.html.

AXIsolatedObject::textMarkerRangeForNSRange needs to autorelease the
object retrieved from the main thread. This was causing intermittent
crashes when accessing the return value off of the main thread.

* accessibility/isolatedtree/mac/AXIsolatedObjectMac.mm:
(WebCore::AXIsolatedObject::textMarkerRangeForNSRange const):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (287125 => 287126)


--- trunk/Source/WebCore/ChangeLog	2021-12-16 04:33:12 UTC (rev 287125)
+++ trunk/Source/WebCore/ChangeLog	2021-12-16 07:08:17 UTC (rev 287126)
@@ -1,3 +1,20 @@
+2021-12-15  Andres Gonzalez  <andresg...@apple.com>
+
+        Fix for crash in AXIsolatedObject::textMarkerRangeForNSRange.
+        https://bugs.webkit.org/show_bug.cgi?id=234377
+        <rdar://problem/86553198>
+
+        Reviewed by Chris Fleizach.
+
+        Covered by accessibility/mac/textmarker-range-for-range.html.
+
+        AXIsolatedObject::textMarkerRangeForNSRange needs to autorelease the
+        object retrieved from the main thread. This was causing intermittent
+        crashes when accessing the return value off of the main thread.
+
+        * accessibility/isolatedtree/mac/AXIsolatedObjectMac.mm:
+        (WebCore::AXIsolatedObject::textMarkerRangeForNSRange const):
+
 2021-12-15  Brady Eidson  <beid...@apple.com>
 
         Add a "NotificationData" object to encompass local Notification-related parameters, instead of passing tons of them around everywhere.

Modified: trunk/Source/WebCore/accessibility/isolatedtree/mac/AXIsolatedObjectMac.mm (287125 => 287126)


--- trunk/Source/WebCore/accessibility/isolatedtree/mac/AXIsolatedObjectMac.mm	2021-12-16 04:33:12 UTC (rev 287125)
+++ trunk/Source/WebCore/accessibility/isolatedtree/mac/AXIsolatedObjectMac.mm	2021-12-16 07:08:17 UTC (rev 287126)
@@ -80,7 +80,7 @@
 
 AXTextMarkerRangeRef AXIsolatedObject::textMarkerRangeForNSRange(const NSRange& range) const
 {
-    return Accessibility::retrieveValueFromMainThread<AXTextMarkerRangeRef>([&range, this] () -> AXTextMarkerRangeRef {
+    return Accessibility::retrieveAutoreleasedValueFromMainThread<AXTextMarkerRangeRef>([&range, this] () -> RetainPtr<AXTextMarkerRangeRef> {
         auto* axObject = associatedAXObject();
         return axObject ? axObject->textMarkerRangeForNSRange(range) : nullptr;
     });
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to