Title: [197285] releases/WebKitGTK/webkit-2.4/Source/WebCore
Revision
197285
Author
[email protected]
Date
2016-02-28 05:44:25 -0800 (Sun, 28 Feb 2016)

Log Message

Merge r186666 - Plugin create can end up destroying its renderer.
https://bugs.webkit.org/show_bug.cgi?id=146824
rdar://problem/18921429

Reviewed by Andreas Kling.

Plugins can run arbitrary code during initialization. If the plugin
happens to destroy the associated node, its renderer becomes invalid.
This patch checks whether the renderer survived the createPlugin() call.
(This WeakPtr pattern is also used in RenderWidget to avoid dangling pointers.)

Speculative fix. Not reproducible.

* loader/SubframeLoader.cpp:
(WebCore::SubframeLoader::loadPlugin):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (197284 => 197285)


--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog	2016-02-28 13:42:16 UTC (rev 197284)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog	2016-02-28 13:44:25 UTC (rev 197285)
@@ -1,3 +1,21 @@
+2015-07-09  Zalan Bujtas  <[email protected]>
+
+        Plugin create can end up destroying its renderer.
+        https://bugs.webkit.org/show_bug.cgi?id=146824
+        rdar://problem/18921429
+
+        Reviewed by Andreas Kling.
+
+        Plugins can run arbitrary code during initialization. If the plugin
+        happens to destroy the associated node, its renderer becomes invalid.
+        This patch checks whether the renderer survived the createPlugin() call.
+        (This WeakPtr pattern is also used in RenderWidget to avoid dangling pointers.)
+
+        Speculative fix. Not reproducible.
+
+        * loader/SubframeLoader.cpp:
+        (WebCore::SubframeLoader::loadPlugin):
+
 2015-08-05  Chris Dumez  <[email protected]>
 
         Crash when removing children of a MathMLSelectElement

Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/loader/SubframeLoader.cpp (197284 => 197285)


--- releases/WebKitGTK/webkit-2.4/Source/WebCore/loader/SubframeLoader.cpp	2016-02-28 13:42:16 UTC (rev 197284)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/loader/SubframeLoader.cpp	2016-02-28 13:44:25 UTC (rev 197285)
@@ -429,10 +429,12 @@
 
 bool SubframeLoader::loadPlugin(HTMLPlugInImageElement& pluginElement, const URL& url, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallback)
 {
+    if (useFallback)
+        return false;
+
     RenderEmbeddedObject* renderer = pluginElement.renderEmbeddedObject();
-
     // FIXME: This code should not depend on renderer!
-    if (!renderer || useFallback)
+    if (!renderer)
         return false;
 
     pluginElement.subframeLoaderWillCreatePlugIn(url);
@@ -446,7 +448,11 @@
         loadManually = false;
 #endif
 
+    WeakPtr<RenderWidget> weakRenderer = renderer->createWeakPtr();
+    // createPlugin *may* cause this renderer to disappear from underneath.
     RefPtr<Widget> widget = m_frame.loader().client().createPlugin(contentSize, &pluginElement, url, paramNames, paramValues, mimeType, loadManually);
+    if (!weakRenderer)
+        return false;
 
     if (!widget) {
         if (!renderer->isPluginUnavailable())
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to