Title: [90025] trunk/Source/WebKit/chromium
Revision
90025
Author
[email protected]
Date
2011-06-29 10:44:35 -0700 (Wed, 29 Jun 2011)

Log Message

2011-06-29  James Hawkins  <[email protected]>

        Reviewed by Pavel Feldman.

        [Chromium] Fix a crash on when executeCommand(copy) is called on a null node.
        https://bugs.webkit.org/show_bug.cgi?id=63626

        * src/WebFrameImpl.cpp:
        (WebKit::pluginContainerFromNode):

Modified Paths

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (90024 => 90025)


--- trunk/Source/WebKit/chromium/ChangeLog	2011-06-29 17:42:55 UTC (rev 90024)
+++ trunk/Source/WebKit/chromium/ChangeLog	2011-06-29 17:44:35 UTC (rev 90025)
@@ -1,3 +1,13 @@
+2011-06-29  James Hawkins  <[email protected]>
+
+        Reviewed by Pavel Feldman.
+
+        [Chromium] Fix a crash on when executeCommand(copy) is called on a null node.
+        https://bugs.webkit.org/show_bug.cgi?id=63626
+
+        * src/WebFrameImpl.cpp:
+        (WebKit::pluginContainerFromNode):
+
 2011-06-29  Andrey Kosyakov  <[email protected]>
 
         Reviewed by Pavel Feldman.

Modified: trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp (90024 => 90025)


--- trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp	2011-06-29 17:42:55 UTC (rev 90024)
+++ trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp	2011-06-29 17:44:35 UTC (rev 90025)
@@ -287,6 +287,9 @@
 
 static WebPluginContainerImpl* pluginContainerFromNode(const WebNode& node)
 {
+    if (node.isNull())
+        return 0;
+
     const Node* coreNode = node.constUnwrap<Node>();
     if (coreNode->hasTagName(HTMLNames::objectTag) || coreNode->hasTagName(HTMLNames::embedTag)) {
         RenderObject* object = coreNode->renderer();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to