Changeset 245080 in webkit

Timestamp:

May 8, 2019 5:03:00 PM (5 years ago)

Author:

achristensen@apple.com

Message:

Don't crash when DOMNode.addEventListener:listener:useCapture: is called with a nil listener
​https://bugs.webkit.org/show_bug.cgi?id=197712
<rdar://problem/50429770>

Reviewed by Tim Horton.

Source/WebKitLegacy/mac:

• DOM/ObjCEventListener.h:
• DOM/ObjCEventListener.mm:

(WebCore::ObjCEventListener::wrap):

Tools:

• TestWebKitAPI/Tests/WebKitLegacy/mac/DeallocWebViewInEventListener.mm:

(TestWebKitAPI::TEST):

Location:

trunk

Files:

• Source/WebKitLegacy/mac/ChangeLog (modified) (1 diff)
• Source/WebKitLegacy/mac/DOM/ObjCEventListener.h (modified) (1 diff)
• Source/WebKitLegacy/mac/DOM/ObjCEventListener.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitLegacy/mac/DeallocWebViewInEventListener.mm (modified) (1 diff)

trunk/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2019-05-08  Alex Christensen  <achristensen@webkit.org>
+
+        Don't crash when DOMNode.addEventListener:listener:useCapture: is called with a nil listener
+        https://bugs.webkit.org/show_bug.cgi?id=197712
+        <rdar://problem/50429770>
+
+        Reviewed by Tim Horton.
+
+        * DOM/ObjCEventListener.h:
+        * DOM/ObjCEventListener.mm:
+        (WebCore::ObjCEventListener::wrap):
+
 2019-05-08  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebKitLegacy/mac/DOM/ObjCEventListener.h

@@ -38 +38 @@
     public:
         typedef id<DOMEventListener> ObjCListener;
-        static Ref<ObjCEventListener> wrap(ObjCListener);
+        static RefPtr<ObjCEventListener> wrap(ObjCListener);
 
         static const ObjCEventListener* cast(const EventListener* listener)

trunk/Source/WebKitLegacy/mac/DOM/ObjCEventListener.mm

@@ -48 +48 @@
 }
 
-Ref<ObjCEventListener> ObjCEventListener::wrap(ObjCListener listener)
+RefPtr<ObjCEventListener> ObjCEventListener::wrap(ObjCListener listener)
 {
-    RefPtr<ObjCEventListener> wrapper = find(listener);
-    if (wrapper)
-        return wrapper.releaseNonNull();
-    return adoptRef(*new ObjCEventListener(listener));
+    if (!listener)
+        return nullptr;
+    if (RefPtr<ObjCEventListener> wrapper = find(listener))
+        return wrapper;
+    return adoptRef(new ObjCEventListener(listener));
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2019-05-08  Alex Christensen  <achristensen@webkit.org>
+
+        Don't crash when DOMNode.addEventListener:listener:useCapture: is called with a nil listener
+        https://bugs.webkit.org/show_bug.cgi?id=197712
+        <rdar://problem/50429770>
+
+        Reviewed by Tim Horton.
+
+        * TestWebKitAPI/Tests/WebKitLegacy/mac/DeallocWebViewInEventListener.mm:
+        (TestWebKitAPI::TEST):
+
 2019-05-08  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/mac/DeallocWebViewInEventListener.mm

@@ -82 +82 @@
         auto listener = adoptNS([[DeallocWebViewInEventListener alloc] init]);
         [[[webView mainFrameDocument] body] addEventListener:@"keypress" listener:listener.get() useCapture:NO];
+        [[[webView mainFrameDocument] body] addEventListener:@"keypress" listener:nullptr useCapture:NO];
         listener = nullptr;
         [webView close];