<!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>[182539] releases/WebKitGTK/webkit-2.6</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/182539">182539</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-08 08:59:06 -0700 (Wed, 08 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/182537">r182537</a> - [GTK] Crash in DOMObjectCache when a wrapped object owned by the cache is unreffed by the user
https://bugs.webkit.org/show_bug.cgi?id=143521
Reviewed by Martin Robinson.
This is a case we claim to support, but it only works if the
object has only one reference. In that case, when the user unrefs
it, the weak ref notify callback removes the object from the
cache. However, if the object has more than one ref, the cache
doesn't know the user unreffed it, and when clearing the cache we
try to remove more references than what the object actually has,
causing a crash in g_object_unref.
* bindings/gobject/DOMObjectCache.cpp:
(WebKit::DOMObjectCacheData::clearObject):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorebindingsgobjectDOMObjectCachecpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/bindings/gobject/DOMObjectCache.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26ToolsChangeLog">releases/WebKitGTK/webkit-2.6/Tools/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26ToolsTestWebKitAPITestsWebKit2GtkDOMNodeTestcpp">releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26ToolsTestWebKitAPITestsWebKit2GtkTestWebExtensionscpp">releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26ToolsTestWebKitAPIgtkWebKit2GtkWebViewTestcpp">releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26ToolsTestWebKitAPIgtkWebKit2GtkWebViewTesth">releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (182538 => 182539)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2015-04-08 15:54:49 UTC (rev 182538)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2015-04-08 15:59:06 UTC (rev 182539)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-04-08 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Crash in DOMObjectCache when a wrapped object owned by the cache is unreffed by the user
+ https://bugs.webkit.org/show_bug.cgi?id=143521
+
+ Reviewed by Martin Robinson.
+
+ This is a case we claim to support, but it only works if the
+ object has only one reference. In that case, when the user unrefs
+ it, the weak ref notify callback removes the object from the
+ cache. However, if the object has more than one ref, the cache
+ doesn't know the user unreffed it, and when clearing the cache we
+ try to remove more references than what the object actually has,
+ causing a crash in g_object_unref.
+
+ * bindings/gobject/DOMObjectCache.cpp:
+ (WebKit::DOMObjectCacheData::clearObject):
+
</ins><span class="cx"> 2015-02-17 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Use HashMap::add instead of get/contains + set in DOMObjectCache
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorebindingsgobjectDOMObjectCachecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/bindings/gobject/DOMObjectCache.cpp (182538 => 182539)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/bindings/gobject/DOMObjectCache.cpp 2015-04-08 15:54:49 UTC (rev 182538)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/bindings/gobject/DOMObjectCache.cpp 2015-04-08 15:59:06 UTC (rev 182539)
</span><span class="lines">@@ -43,7 +43,11 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(object);
</span><span class="cx"> ASSERT(cacheReferences >= 1);
</span><ins>+ ASSERT(object->ref_count >= 1);
</ins><span class="cx">
</span><ins>+ // Make sure we don't unref more than the references the object actually has. It can happen that user
+ // unreffed a reference owned by the cache.
+ cacheReferences = std::min(static_cast<unsigned>(object->ref_count), cacheReferences);
</ins><span class="cx"> GRefPtr<GObject> protect(object);
</span><span class="cx"> do {
</span><span class="cx"> g_object_unref(object);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Tools/ChangeLog (182538 => 182539)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Tools/ChangeLog 2015-04-08 15:54:49 UTC (rev 182538)
+++ releases/WebKitGTK/webkit-2.6/Tools/ChangeLog 2015-04-08 15:59:06 UTC (rev 182539)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-04-08 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Crash in DOMObjectCache when a wrapped object owned by the cache is unreffed by the user
+ https://bugs.webkit.org/show_bug.cgi?id=143521
+
+ Reviewed by Martin Robinson.
+
+ Add a way to detect unexpected web process crashes to WebViewTest,
+ and a test case to testDOMCache to trigger the crash.
+
+ * TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp:
+ (WebKitDOMNodeTest::testDOMCache):
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp:
+ (testWebKitWebViewProcessCrashed):
+ * TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp:
+ (WebViewTest::WebViewTest):
+ (WebViewTest::webProcessCrashed):
+ * TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.h:
+
</ins><span class="cx"> 2015-03-06 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Test /webkit2/WebKitWebView/sync-request-on-max-conns might fail after finished
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26ToolsTestWebKitAPITestsWebKit2GtkDOMNodeTestcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp (182538 => 182539)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp 2015-04-08 15:54:49 UTC (rev 182538)
+++ releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp 2015-04-08 15:59:06 UTC (rev 182539)
</span><span class="lines">@@ -231,6 +231,12 @@
</span><span class="cx"> g_assert(WEBKIT_DOM_IS_HTML_PARAGRAPH_ELEMENT(p2.get()));
</span><span class="cx"> assertObjectIsDeletedWhenTestFinishes(G_OBJECT(p2.get()));
</span><span class="cx">
</span><ins>+ // Manually handling a DOM object owned by the cache shouldn't crash when the cache has more than one reference.
+ GRefPtr<WebKitDOMElement> p3 = adoptGRef(webkit_dom_document_create_element(document, "P", nullptr));
+ g_assert(WEBKIT_DOM_IS_HTML_PARAGRAPH_ELEMENT(p3.get()));
+ assertObjectIsDeletedWhenTestFinishes(G_OBJECT(p3.get()));
+ webkit_dom_node_append_child(WEBKIT_DOM_NODE(div), WEBKIT_DOM_NODE(p3.get()), nullptr);
+
</ins><span class="cx"> // DOM objects removed from the document are also correctly handled by the cache.
</span><span class="cx"> WebKitDOMElement* a = webkit_dom_document_create_element(document, "A", nullptr);
</span><span class="cx"> g_assert(WEBKIT_DOM_IS_ELEMENT(a));
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26ToolsTestWebKitAPITestsWebKit2GtkTestWebExtensionscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp (182538 => 182539)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp 2015-04-08 15:54:49 UTC (rev 182538)
+++ releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp 2015-04-08 15:59:06 UTC (rev 182539)
</span><span class="lines">@@ -86,9 +86,11 @@
</span><span class="cx"> test->loadHtml("<html></html>", 0);
</span><span class="cx"> test->waitUntilLoadFinished();
</span><span class="cx">
</span><del>- g_signal_connect(test->m_webView, "web-process-crashed",
</del><ins>+ g_signal_connect_after(test->m_webView, "web-process-crashed",
</ins><span class="cx"> G_CALLBACK(webProcessCrashedCallback), test);
</span><span class="cx">
</span><ins>+ test->m_expectedWebProcessCrash = true;
+
</ins><span class="cx"> GRefPtr<GDBusProxy> proxy = adoptGRef(bus->createProxy("org.webkit.gtk.WebExtensionTest",
</span><span class="cx"> "/org/webkit/gtk/WebExtensionTest", "org.webkit.gtk.WebExtensionTest", test->m_mainLoop));
</span><span class="cx">
</span><span class="lines">@@ -100,6 +102,7 @@
</span><span class="cx"> -1, 0, 0));
</span><span class="cx"> g_assert(!result);
</span><span class="cx"> g_main_loop_run(test->m_mainLoop);
</span><ins>+ test->m_expectedWebProcessCrash = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void testWebExtensionWindowObjectCleared(WebViewTest* test, gconstpointer)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26ToolsTestWebKitAPIgtkWebKit2GtkWebViewTestcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp (182538 => 182539)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp 2015-04-08 15:54:49 UTC (rev 182538)
+++ releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp 2015-04-08 15:59:06 UTC (rev 182539)
</span><span class="lines">@@ -34,8 +34,10 @@
</span><span class="cx"> , m_javascriptResult(0)
</span><span class="cx"> , m_resourceDataSize(0)
</span><span class="cx"> , m_surface(0)
</span><ins>+ , m_expectedWebProcessCrash(false)
</ins><span class="cx"> {
</span><span class="cx"> assertObjectIsDeletedWhenTestFinishes(G_OBJECT(m_webView));
</span><ins>+ g_signal_connect(m_webView, "web-process-crashed", G_CALLBACK(WebViewTest::webProcessCrashed), this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebViewTest::~WebViewTest()
</span><span class="lines">@@ -50,6 +52,16 @@
</span><span class="cx"> g_main_loop_unref(m_mainLoop);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+gboolean WebViewTest::webProcessCrashed(WebKitWebView*, WebViewTest* test)
+{
+ if (test->m_expectedWebProcessCrash) {
+ test->m_expectedWebProcessCrash = false;
+ return FALSE;
+ }
+ g_assert_not_reached();
+ return TRUE;
+}
+
</ins><span class="cx"> void WebViewTest::loadURI(const char* uri)
</span><span class="cx"> {
</span><span class="cx"> m_activeURI = uri;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26ToolsTestWebKitAPIgtkWebKit2GtkWebViewTesth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.h (182538 => 182539)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.h 2015-04-08 15:54:49 UTC (rev 182538)
+++ releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.h 2015-04-08 15:59:06 UTC (rev 182539)
</span><span class="lines">@@ -72,6 +72,8 @@
</span><span class="cx">
</span><span class="cx"> bool runWebProcessTest(const char* suiteName, const char* testName);
</span><span class="cx">
</span><ins>+ static gboolean webProcessCrashed(WebKitWebView*, WebViewTest*);
+
</ins><span class="cx"> WebKitWebView* m_webView;
</span><span class="cx"> GMainLoop* m_mainLoop;
</span><span class="cx"> CString m_activeURI;
</span><span class="lines">@@ -82,6 +84,7 @@
</span><span class="cx"> GUniquePtr<char> m_resourceData;
</span><span class="cx"> size_t m_resourceDataSize;
</span><span class="cx"> cairo_surface_t* m_surface;
</span><ins>+ bool m_expectedWebProcessCrash;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void doMouseButtonEvent(GdkEventType, int, int, unsigned, unsigned);
</span></span></pre>
</div>
</div>
</body>
</html>