<!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>[242861] branches/safari-607-branch</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/242861">242861</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2019-03-13 01:24:54 -0700 (Wed, 13 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/242749">r242749</a>. rdar://problem/48839358

    [macOS] Dispatching reentrant "contextmenu" events may cause crashes
    https://bugs.webkit.org/show_bug.cgi?id=195571
    <rdar://problem/48086046>

    Reviewed by Andy Estes.

    Source/WebCore:

    Make ContextMenuController::handleContextMenuEvent robust against reentrancy by guarding it with a boolean flag.
    As demonstrated in the test case, it is currently possible to force WebKit into a bad state by dispatching a
    synthetic "contextmenu" event from within the scope of one of the "before(copy|cut|paste)" events triggered as
    a result of handling a context menu event.

    Test: fast/events/contextmenu-reentrancy-crash.html

    * page/ContextMenuController.cpp:
    (WebCore::ContextMenuController::handleContextMenuEvent):
    * page/ContextMenuController.h:

    LayoutTests:

    Add a test to verify that triggering reentrant "contextmenu" events from script does not cause a crash.

    * fast/events/contextmenu-reentrancy-crash-expected.txt: Added.
    * fast/events/contextmenu-reentrancy-crash.html: Added.

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242749 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari607branchLayoutTestsChangeLog">branches/safari-607-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari607branchSourceWebCoreChangeLog">branches/safari-607-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari607branchSourceWebCorepageContextMenuControllercpp">branches/safari-607-branch/Source/WebCore/page/ContextMenuController.cpp</a></li>
<li><a href="#branchessafari607branchSourceWebCorepageContextMenuControllerh">branches/safari-607-branch/Source/WebCore/page/ContextMenuController.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari607branchLayoutTestsfasteventscontextmenureentrancycrashexpectedtxt">branches/safari-607-branch/LayoutTests/fast/events/contextmenu-reentrancy-crash-expected.txt</a></li>
<li><a href="#branchessafari607branchLayoutTestsfasteventscontextmenureentrancycrashhtml">branches/safari-607-branch/LayoutTests/fast/events/contextmenu-reentrancy-crash.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari607branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/LayoutTests/ChangeLog (242860 => 242861)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/LayoutTests/ChangeLog 2019-03-13 08:24:51 UTC (rev 242860)
+++ branches/safari-607-branch/LayoutTests/ChangeLog    2019-03-13 08:24:54 UTC (rev 242861)
</span><span class="lines">@@ -1,5 +1,50 @@
</span><span class="cx"> 2019-03-13  Babak Shafiei  <bshafiei@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r242749. rdar://problem/48839358
+
+    [macOS] Dispatching reentrant "contextmenu" events may cause crashes
+    https://bugs.webkit.org/show_bug.cgi?id=195571
+    <rdar://problem/48086046>
+    
+    Reviewed by Andy Estes.
+    
+    Source/WebCore:
+    
+    Make ContextMenuController::handleContextMenuEvent robust against reentrancy by guarding it with a boolean flag.
+    As demonstrated in the test case, it is currently possible to force WebKit into a bad state by dispatching a
+    synthetic "contextmenu" event from within the scope of one of the "before(copy|cut|paste)" events triggered as
+    a result of handling a context menu event.
+    
+    Test: fast/events/contextmenu-reentrancy-crash.html
+    
+    * page/ContextMenuController.cpp:
+    (WebCore::ContextMenuController::handleContextMenuEvent):
+    * page/ContextMenuController.h:
+    
+    LayoutTests:
+    
+    Add a test to verify that triggering reentrant "contextmenu" events from script does not cause a crash.
+    
+    * fast/events/contextmenu-reentrancy-crash-expected.txt: Added.
+    * fast/events/contextmenu-reentrancy-crash.html: Added.
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242749 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-03-11  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+            [macOS] Dispatching reentrant "contextmenu" events may cause crashes
+            https://bugs.webkit.org/show_bug.cgi?id=195571
+            <rdar://problem/48086046>
+
+            Reviewed by Andy Estes.
+
+            Add a test to verify that triggering reentrant "contextmenu" events from script does not cause a crash.
+
+            * fast/events/contextmenu-reentrancy-crash-expected.txt: Added.
+            * fast/events/contextmenu-reentrancy-crash.html: Added.
+
+2019-03-13  Babak Shafiei  <bshafiei@apple.com>
+
</ins><span class="cx">         Cherry-pick r242587. rdar://problem/48839354
</span><span class="cx"> 
</span><span class="cx">     Crash when attempting to change input type while dismissing datalist suggestions
</span></span></pre></div>
<a id="branchessafari607branchLayoutTestsfasteventscontextmenureentrancycrashexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-607-branch/LayoutTests/fast/events/contextmenu-reentrancy-crash-expected.txt (0 => 242861)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/LayoutTests/fast/events/contextmenu-reentrancy-crash-expected.txt                             (rev 0)
+++ branches/safari-607-branch/LayoutTests/fast/events/contextmenu-reentrancy-crash-expected.txt        2019-03-13 08:24:54 UTC (rev 242861)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+This test verifies that we don't crash when attempting to handle "contextmenu" events in a reentrant manner. This test passes if the green text "PASS" is present after page load.
+
+PASS
</ins></span></pre></div>
<a id="branchessafari607branchLayoutTestsfasteventscontextmenureentrancycrashhtml"></a>
<div class="addfile"><h4>Added: branches/safari-607-branch/LayoutTests/fast/events/contextmenu-reentrancy-crash.html (0 => 242861)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/LayoutTests/fast/events/contextmenu-reentrancy-crash.html                             (rev 0)
+++ branches/safari-607-branch/LayoutTests/fast/events/contextmenu-reentrancy-crash.html        2019-03-13 08:24:54 UTC (rev 242861)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<p>This test verifies that we don't crash when attempting to handle "contextmenu" events in a reentrant manner. This test passes if the green text "PASS" is present after page load.</p>
+</body>
+<script>
+if (window.testRunner)
+    testRunner.dumpAsText();
+
+function dispatchContextMenuEvent() {
+    document.body.dispatchEvent(new MouseEvent("contextmenu"));
+}
+
+document.designMode = "on";
+document.addEventListener("beforepaste", dispatchContextMenuEvent);
+dispatchContextMenuEvent();
+document.writeln("<pre style='color: green'>PASS</pre>");
+</script>
+</html>
</ins></span></pre></div>
<a id="branchessafari607branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebCore/ChangeLog (242860 => 242861)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebCore/ChangeLog      2019-03-13 08:24:51 UTC (rev 242860)
+++ branches/safari-607-branch/Source/WebCore/ChangeLog 2019-03-13 08:24:54 UTC (rev 242861)
</span><span class="lines">@@ -1,5 +1,56 @@
</span><span class="cx"> 2019-03-13  Babak Shafiei  <bshafiei@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r242749. rdar://problem/48839358
+
+    [macOS] Dispatching reentrant "contextmenu" events may cause crashes
+    https://bugs.webkit.org/show_bug.cgi?id=195571
+    <rdar://problem/48086046>
+    
+    Reviewed by Andy Estes.
+    
+    Source/WebCore:
+    
+    Make ContextMenuController::handleContextMenuEvent robust against reentrancy by guarding it with a boolean flag.
+    As demonstrated in the test case, it is currently possible to force WebKit into a bad state by dispatching a
+    synthetic "contextmenu" event from within the scope of one of the "before(copy|cut|paste)" events triggered as
+    a result of handling a context menu event.
+    
+    Test: fast/events/contextmenu-reentrancy-crash.html
+    
+    * page/ContextMenuController.cpp:
+    (WebCore::ContextMenuController::handleContextMenuEvent):
+    * page/ContextMenuController.h:
+    
+    LayoutTests:
+    
+    Add a test to verify that triggering reentrant "contextmenu" events from script does not cause a crash.
+    
+    * fast/events/contextmenu-reentrancy-crash-expected.txt: Added.
+    * fast/events/contextmenu-reentrancy-crash.html: Added.
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242749 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-03-11  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+            [macOS] Dispatching reentrant "contextmenu" events may cause crashes
+            https://bugs.webkit.org/show_bug.cgi?id=195571
+            <rdar://problem/48086046>
+
+            Reviewed by Andy Estes.
+
+            Make ContextMenuController::handleContextMenuEvent robust against reentrancy by guarding it with a boolean flag.
+            As demonstrated in the test case, it is currently possible to force WebKit into a bad state by dispatching a
+            synthetic "contextmenu" event from within the scope of one of the "before(copy|cut|paste)" events triggered as
+            a result of handling a context menu event.
+
+            Test: fast/events/contextmenu-reentrancy-crash.html
+
+            * page/ContextMenuController.cpp:
+            (WebCore::ContextMenuController::handleContextMenuEvent):
+            * page/ContextMenuController.h:
+
+2019-03-13  Babak Shafiei  <bshafiei@apple.com>
+
</ins><span class="cx">         Cherry-pick r242587. rdar://problem/48839354
</span><span class="cx"> 
</span><span class="cx">     Crash when attempting to change input type while dismissing datalist suggestions
</span></span></pre></div>
<a id="branchessafari607branchSourceWebCorepageContextMenuControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebCore/page/ContextMenuController.cpp (242860 => 242861)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebCore/page/ContextMenuController.cpp 2019-03-13 08:24:51 UTC (rev 242860)
+++ branches/safari-607-branch/Source/WebCore/page/ContextMenuController.cpp    2019-03-13 08:24:54 UTC (rev 242861)
</span><span class="lines">@@ -68,6 +68,7 @@
</span><span class="cx"> #include "UserTypingGestureIndicator.h"
</span><span class="cx"> #include "WindowFeatures.h"
</span><span class="cx"> #include "markup.h"
</span><ins>+#include <wtf/SetForScope.h>
</ins><span class="cx"> #include <wtf/WallTime.h>
</span><span class="cx"> #include <wtf/unicode/CharacterNames.h>
</span><span class="cx"> 
</span><span class="lines">@@ -97,6 +98,11 @@
</span><span class="cx"> 
</span><span class="cx"> void ContextMenuController::handleContextMenuEvent(Event& event)
</span><span class="cx"> {
</span><ins>+    if (m_isHandlingContextMenuEvent)
+        return;
+
+    SetForScope<bool> isHandlingContextMenuEventForScope(m_isHandlingContextMenuEvent, true);
+
</ins><span class="cx">     m_contextMenu = maybeCreateContextMenu(event);
</span><span class="cx">     if (!m_contextMenu)
</span><span class="cx">         return;
</span></span></pre></div>
<a id="branchessafari607branchSourceWebCorepageContextMenuControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebCore/page/ContextMenuController.h (242860 => 242861)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebCore/page/ContextMenuController.h   2019-03-13 08:24:51 UTC (rev 242860)
+++ branches/safari-607-branch/Source/WebCore/page/ContextMenuController.h      2019-03-13 08:24:54 UTC (rev 242861)
</span><span class="lines">@@ -93,6 +93,7 @@
</span><span class="cx">     std::unique_ptr<ContextMenu> m_contextMenu;
</span><span class="cx">     RefPtr<ContextMenuProvider> m_menuProvider;
</span><span class="cx">     ContextMenuContext m_context;
</span><ins>+    bool m_isHandlingContextMenuEvent { false };
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>

</body>
</html>