<!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>[211858] releases/WebKitGTK/webkit-2.14/Source/WebKit2</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/211858">211858</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-08 03:05:13 -0800 (Wed, 08 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[SOUP] Network process crash in WebKit::CustomProtocolManagerImpl::didFailWithError
https://bugs.webkit.org/show_bug.cgi?id=165082
CustomProtocolManager uses a Workqueue to receive the IPC messages since <a href="http://trac.webkit.org/projects/webkit/changeset/149194">r149194</a>. Then we added the Soup
implementation adopting that approach, but without making our implementation thread safe. The crash happens
because the CustomProtocolManager implementation is used by two threads at the same time, the main thread
because of a ping load (probably caused by an image load in the unload handler, I haven't been able to reproduce
the crash) and the work queue thread. I'm not sure if the reasons to make CustomProtocolManager use a WorkQueue
are still valid for Mac, but I don't think they are for Soup. CustomProtocolManager is now only used in the
network process and sync loads don't use any nested run loop, they are just an IPC sync message. So this patch
makes CustomProtocolManager a normal message receiver again for Soup to ensure messages are handled in the main
thread as expected by the Soup implementation.
* NetworkProcess/CustomProtocols/CustomProtocolManager.h:
(WebKit::CustomProtocolManager::childProcess): Remove WorkQueue initialization.
* NetworkProcess/CustomProtocols/soup/CustomProtocolManagerSoup.cpp:
(WebKit::CustomProtocolManager::CustomProtocolManager): Register the message receiver.
(WebKit::CustomProtocolManager::initializeConnection): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2NetworkProcessCustomProtocolsCustomProtocolManagerh">releases/WebKitGTK/webkit-2.14/Source/WebKit2/NetworkProcess/CustomProtocols/CustomProtocolManager.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2NetworkProcessCustomProtocolssoupCustomProtocolManagerSoupcpp">releases/WebKitGTK/webkit-2.14/Source/WebKit2/NetworkProcess/CustomProtocols/soup/CustomProtocolManagerSoup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog (211857 => 211858)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2017-02-08 10:39:49 UTC (rev 211857)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2017-02-08 11:05:13 UTC (rev 211858)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-01-04 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [SOUP] Network process crash in WebKit::CustomProtocolManagerImpl::didFailWithError
+ https://bugs.webkit.org/show_bug.cgi?id=165082
+
+ CustomProtocolManager uses a Workqueue to receive the IPC messages since r149194. Then we added the Soup
+ implementation adopting that approach, but without making our implementation thread safe. The crash happens
+ because the CustomProtocolManager implementation is used by two threads at the same time, the main thread
+ because of a ping load (probably caused by an image load in the unload handler, I haven't been able to reproduce
+ the crash) and the work queue thread. I'm not sure if the reasons to make CustomProtocolManager use a WorkQueue
+ are still valid for Mac, but I don't think they are for Soup. CustomProtocolManager is now only used in the
+ network process and sync loads don't use any nested run loop, they are just an IPC sync message. So this patch
+ makes CustomProtocolManager a normal message receiver again for Soup to ensure messages are handled in the main
+ thread as expected by the Soup implementation.
+
+ * NetworkProcess/CustomProtocols/CustomProtocolManager.h:
+ (WebKit::CustomProtocolManager::childProcess): Remove WorkQueue initialization.
+ * NetworkProcess/CustomProtocols/soup/CustomProtocolManagerSoup.cpp:
+ (WebKit::CustomProtocolManager::CustomProtocolManager): Register the message receiver.
+ (WebKit::CustomProtocolManager::initializeConnection): Deleted.
+
</ins><span class="cx"> 2017-01-30 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Fix GTK+ debug build after r211365.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2NetworkProcessCustomProtocolsCustomProtocolManagerh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/NetworkProcess/CustomProtocols/CustomProtocolManager.h (211857 => 211858)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/NetworkProcess/CustomProtocols/CustomProtocolManager.h 2017-02-08 10:39:49 UTC (rev 211857)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/NetworkProcess/CustomProtocols/CustomProtocolManager.h 2017-02-08 11:05:13 UTC (rev 211858)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define CustomProtocolManager_h
</span><span class="cx">
</span><span class="cx"> #include "Connection.h"
</span><ins>+#include "MessageReceiver.h"
</ins><span class="cx"> #include "NetworkProcessSupplement.h"
</span><span class="cx"> #include <wtf/WorkQueue.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -59,7 +60,13 @@
</span><span class="cx"> class ChildProcess;
</span><span class="cx"> struct NetworkProcessCreationParameters;
</span><span class="cx">
</span><del>-class CustomProtocolManager : public NetworkProcessSupplement, public IPC::Connection::WorkQueueMessageReceiver {
</del><ins>+class CustomProtocolManager : public NetworkProcessSupplement
+#if PLATFORM(COCOA)
+ , public IPC::Connection::WorkQueueMessageReceiver {
+#endif
+#if USE(SOUP)
+ , public IPC::MessageReceiver {
+#endif
</ins><span class="cx"> WTF_MAKE_NONCOPYABLE(CustomProtocolManager);
</span><span class="cx"> public:
</span><span class="cx"> explicit CustomProtocolManager(ChildProcess*);
</span><span class="lines">@@ -81,15 +88,17 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // ChildProcessSupplement
</span><span class="cx"> void initializeConnection(IPC::Connection*) override;
</span><ins>+#endif
</ins><span class="cx">
</span><ins>+ // IPC::MessageReceiver
+ void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
+
</ins><span class="cx"> // NetworkProcessSupplement
</span><span class="cx"> void initialize(const NetworkProcessCreationParameters&) override;
</span><span class="cx">
</span><del>- // IPC::MessageReceiver
- void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
-
</del><span class="cx"> void didFailWithError(uint64_t customProtocolID, const WebCore::ResourceError&);
</span><span class="cx"> void didLoadData(uint64_t customProtocolID, const IPC::DataReference&);
</span><span class="cx"> void didReceiveResponse(uint64_t customProtocolID, const WebCore::ResourceResponse&, uint32_t cacheStoragePolicy);
</span><span class="lines">@@ -97,9 +106,9 @@
</span><span class="cx"> void wasRedirectedToRequest(uint64_t customProtocolID, const WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse);
</span><span class="cx">
</span><span class="cx"> ChildProcess* m_childProcess;
</span><del>- RefPtr<WorkQueue> m_messageQueue;
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><ins>+ RefPtr<WorkQueue> m_messageQueue;
</ins><span class="cx"> HashSet<String, ASCIICaseInsensitiveHash> m_registeredSchemes;
</span><span class="cx"> Lock m_registeredSchemesMutex;
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2NetworkProcessCustomProtocolssoupCustomProtocolManagerSoupcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/NetworkProcess/CustomProtocols/soup/CustomProtocolManagerSoup.cpp (211857 => 211858)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/NetworkProcess/CustomProtocols/soup/CustomProtocolManagerSoup.cpp 2017-02-08 10:39:49 UTC (rev 211857)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/NetworkProcess/CustomProtocols/soup/CustomProtocolManagerSoup.cpp 2017-02-08 11:05:13 UTC (rev 211858)
</span><span class="lines">@@ -24,7 +24,6 @@
</span><span class="cx"> #include "CustomProtocolManagerImpl.h"
</span><span class="cx"> #include "CustomProtocolManagerMessages.h"
</span><span class="cx"> #include "NetworkProcessCreationParameters.h"
</span><del>-#include "WebProcessCreationParameters.h"
</del><span class="cx"> #include <WebCore/NotImplemented.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -36,16 +35,11 @@
</span><span class="cx">
</span><span class="cx"> CustomProtocolManager::CustomProtocolManager(ChildProcess* childProcess)
</span><span class="cx"> : m_childProcess(childProcess)
</span><del>- , m_messageQueue(WorkQueue::create("com.apple.WebKit.CustomProtocolManager"))
</del><span class="cx"> , m_impl(std::make_unique<CustomProtocolManagerImpl>(childProcess))
</span><span class="cx"> {
</span><ins>+ m_childProcess->addMessageReceiver(Messages::CustomProtocolManager::messageReceiverName(), *this);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void CustomProtocolManager::initializeConnection(IPC::Connection* connection)
-{
- connection->addWorkQueueMessageReceiver(Messages::CustomProtocolManager::messageReceiverName(), m_messageQueue.get(), this);
-}
-
</del><span class="cx"> void CustomProtocolManager::initialize(const NetworkProcessCreationParameters& parameters)
</span><span class="cx"> {
</span><span class="cx"> for (size_t i = 0; i < parameters.urlSchemesRegisteredForCustomProtocols.size(); ++i)
</span></span></pre>
</div>
</div>
</body>
</html>