<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[245080] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/245080">245080</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2019-05-08 17:03:00 -0700 (Wed, 08 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>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):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitLegacymacChangeLog">trunk/Source/WebKitLegacy/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitLegacymacDOMObjCEventListenerh">trunk/Source/WebKitLegacy/mac/DOM/ObjCEventListener.h</a></li>
<li><a href="#trunkSourceWebKitLegacymacDOMObjCEventListenermm">trunk/Source/WebKitLegacy/mac/DOM/ObjCEventListener.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitLegacymacDeallocWebViewInEventListenermm">trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/mac/DeallocWebViewInEventListener.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitLegacymacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (245079 => 245080)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/ChangeLog  2019-05-08 23:46:03 UTC (rev 245079)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog     2019-05-09 00:03:00 UTC (rev 245080)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+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):
+
</ins><span class="cx"> 2019-05-08  Daniel Bates  <dabates@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [Legacy WebKit] REGRESSION (r238078): Crash in hardwareKeyboardAvailabilityChangedCallback()
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacDOMObjCEventListenerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/DOM/ObjCEventListener.h (245079 => 245080)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/DOM/ObjCEventListener.h    2019-05-08 23:46:03 UTC (rev 245079)
+++ trunk/Source/WebKitLegacy/mac/DOM/ObjCEventListener.h       2019-05-09 00:03:00 UTC (rev 245080)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">     class ObjCEventListener : public EventListener {
</span><span class="cx">     public:
</span><span class="cx">         typedef id<DOMEventListener> ObjCListener;
</span><del>-        static Ref<ObjCEventListener> wrap(ObjCListener);
</del><ins>+        static RefPtr<ObjCEventListener> wrap(ObjCListener);
</ins><span class="cx"> 
</span><span class="cx">         static const ObjCEventListener* cast(const EventListener* listener)
</span><span class="cx">         {
</span></span></pre></div>
<a id="trunkSourceWebKitLegacymacDOMObjCEventListenermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKitLegacy/mac/DOM/ObjCEventListener.mm (245079 => 245080)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKitLegacy/mac/DOM/ObjCEventListener.mm   2019-05-08 23:46:03 UTC (rev 245079)
+++ trunk/Source/WebKitLegacy/mac/DOM/ObjCEventListener.mm      2019-05-09 00:03:00 UTC (rev 245080)
</span><span class="lines">@@ -47,12 +47,13 @@
</span><span class="cx">     return map->get(listener);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-Ref<ObjCEventListener> ObjCEventListener::wrap(ObjCListener listener)
</del><ins>+RefPtr<ObjCEventListener> ObjCEventListener::wrap(ObjCListener listener)
</ins><span class="cx"> {
</span><del>-    RefPtr<ObjCEventListener> wrapper = find(listener);
-    if (wrapper)
-        return wrapper.releaseNonNull();
-    return adoptRef(*new ObjCEventListener(listener));
</del><ins>+    if (!listener)
+        return nullptr;
+    if (RefPtr<ObjCEventListener> wrapper = find(listener))
+        return wrapper;
+    return adoptRef(new ObjCEventListener(listener));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> ObjCEventListener::ObjCEventListener(ObjCListener listener)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (245079 => 245080)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2019-05-08 23:46:03 UTC (rev 245079)
+++ trunk/Tools/ChangeLog       2019-05-09 00:03:00 UTC (rev 245080)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+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):
+
</ins><span class="cx"> 2019-05-08  Jonathan Bedard  <jbedard@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Change my status to be a WebKit reviewer.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitLegacymacDeallocWebViewInEventListenermm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/mac/DeallocWebViewInEventListener.mm (245079 => 245080)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/mac/DeallocWebViewInEventListener.mm        2019-05-08 23:46:03 UTC (rev 245079)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/mac/DeallocWebViewInEventListener.mm   2019-05-09 00:03:00 UTC (rev 245080)
</span><span class="lines">@@ -81,6 +81,7 @@
</span><span class="cx"> 
</span><span class="cx">         auto listener = adoptNS([[DeallocWebViewInEventListener alloc] init]);
</span><span class="cx">         [[[webView mainFrameDocument] body] addEventListener:@"keypress" listener:listener.get() useCapture:NO];
</span><ins>+        [[[webView mainFrameDocument] body] addEventListener:@"keypress" listener:nullptr useCapture:NO];
</ins><span class="cx">         listener = nullptr;
</span><span class="cx">         [webView close];
</span><span class="cx">         [pool drain];
</span></span></pre>
</div>
</div>

</body>
</html>