Changeset 252729 in webkit

Timestamp:

Nov 20, 2019, 11:25:43 PM (7 years ago)

Author:

Conrad Shultz

Message:

Crash at com.apple.WebCore: -[WebRevealHighlight revealContext:drawRectsForItem:]
​https://bugs.webkit.org/show_bug.cgi?id=204434

Reviewed by Megan Gardner.

_attributedString was not retained, leading to a potential use-after-dealloc. Fix
this by wrapping it in a RetainPtr. While we're here, remove explicit ivars and
property synthesis and copy the string during assignment.

Reveal functionality is currently not testable.

• editing/cocoa/DictionaryLookup.mm:

(SOFT_LINK_CLASS_OPTIONAL):
(-[WebRevealHighlight initWithHighlightRect:useDefaultHighlight:attributedString:]):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/cocoa/DictionaryLookup.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-20  Conrad Shultz  <conrad_shultz@apple.com>
+
+        Crash at com.apple.WebCore: -[WebRevealHighlight revealContext:drawRectsForItem:]
+        https://bugs.webkit.org/show_bug.cgi?id=204434
+
+        Reviewed by Megan Gardner.
+
+        _attributedString was not retained, leading to a potential use-after-dealloc. Fix
+        this by wrapping it in a RetainPtr. While we're here, remove explicit ivars and
+        property synthesis and copy the string during assignment.
+
+        Reveal functionality is currently not testable.
+
+        * editing/cocoa/DictionaryLookup.mm:
+        (SOFT_LINK_CLASS_OPTIONAL):
+        (-[WebRevealHighlight initWithHighlightRect:useDefaultHighlight:attributedString:]):
+
 2019-11-20  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WebCore/editing/cocoa/DictionaryLookup.mm

@@ -80 +80 @@
 @private
     Function<void()> _clearTextIndicator;
-    NSRect _highlightRect;
-    BOOL _useDefaultHighlight;
-    NSAttributedString *_attributedString;
 }
 
 @property (nonatomic, readonly) NSRect highlightRect;
 @property (nonatomic, readonly) BOOL useDefaultHighlight;
-@property (nonatomic, readonly) NSAttributedString *attributedString;
+@property (nonatomic, readonly) RetainPtr<NSAttributedString> attributedString;
 
 - (instancetype)initWithHighlightRect:(NSRect)highlightRect useDefaultHighlight:(BOOL)useDefaultHighlight attributedString:(NSAttributedString *) attributedString;
@@ -96 +93 @@
 @implementation WebRevealHighlight
 
-@synthesize highlightRect=_highlightRect;
-@synthesize useDefaultHighlight=_useDefaultHighlight;
-@synthesize attributedString=_attributedString;
-
 - (instancetype)initWithHighlightRect:(NSRect)highlightRect useDefaultHighlight:(BOOL)useDefaultHighlight attributedString:(NSAttributedString *) attributedString
 {
@@ -107 +100 @@
     _highlightRect = highlightRect;
     _useDefaultHighlight = useDefaultHighlight;
-    _attributedString = attributedString;
+    _attributedString = adoptNS([attributedString copy]);
     
     return self;