[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

jhoneycutt at apple.com jhoneycutt at apple.com
Thu Apr 8 01:18:35 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit 9172c9ab5e54c002f6c421b6ed74149d215f7b43
Author: jhoneycutt at apple.com <jhoneycutt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 21 01:03:31 2010 +0000

    <rdar://problem/7086565> Crash in WebCore::PlugInView::dispatchNPEvent
    
    Reviewed by Sam Weinig.
    
    * plugins/PluginView.cpp:
    (WebCore::PluginView::handleEvent):
    Ref the PluginView to protect it from deletion while calling into the
    plug-in.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53581 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 376f3e6..fa452a7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -146,6 +146,17 @@
 
 2010-01-20  Jon Honeycutt  <jhoneycutt at apple.com>
 
+        <rdar://problem/7086565> Crash in WebCore::PlugInView::dispatchNPEvent
+
+        Reviewed by Sam Weinig.
+
+        * plugins/PluginView.cpp:
+        (WebCore::PluginView::handleEvent):
+        Ref the PluginView to protect it from deletion while calling into the
+        plug-in.
+
+2010-01-20  Jon Honeycutt  <jhoneycutt at apple.com>
+
         MSAA: accSelect() is not implemented
 
         https://bugs.webkit.org/show_bug.cgi?id=33918
diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp
index 2f6753c..f669c6d 100644
--- a/WebCore/plugins/PluginView.cpp
+++ b/WebCore/plugins/PluginView.cpp
@@ -145,6 +145,9 @@ void PluginView::handleEvent(Event* event)
     if (!m_plugin || m_isWindowed)
         return;
 
+    // Protect the plug-in from deletion while dispatching the event.
+    RefPtr<PluginView> protect(this);
+
     if (event->isMouseEvent())
         handleMouseEvent(static_cast<MouseEvent*>(event));
     else if (event->isKeyboardEvent())

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list