[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit b4138b18f42dd8dc51c8ce00bed7548e7250f6e8
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 19 15:47:12 2010 +0000

    Crash in WebKit::PluginView::manualLoadDidReceiveResponse when navigating to a .wav file in WebKit2 on Mac
    https://bugs.webkit.org/show_bug.cgi?id=48559
    <rdar://problem/8606622>
    
    Reviewed by Adam Roben.
    
    Add null checks for m_plugin.
    
    * WebProcess/Plugins/PluginView.cpp:
    (WebKit::PluginView::manualLoadDidReceiveResponse):
    (WebKit::PluginView::manualLoadDidReceiveData):
    (WebKit::PluginView::manualLoadDidFinishLoading):
    (WebKit::PluginView::manualLoadDidFail):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72401 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index d54e2ae..a626a77 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,19 @@
+2010-11-18  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Adam Roben.
+
+        Crash in WebKit::PluginView::manualLoadDidReceiveResponse when navigating to a .wav file in WebKit2 on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=48559
+        <rdar://problem/8606622>
+
+        Add null checks for m_plugin.
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::manualLoadDidReceiveResponse):
+        (WebKit::PluginView::manualLoadDidReceiveData):
+        (WebKit::PluginView::manualLoadDidFinishLoading):
+        (WebKit::PluginView::manualLoadDidFail):
+
 2010-11-18  Mark Rowe  <mrowe at apple.com>
 
         Rubber-stamped by Adam Roben.
diff --git a/WebKit2/WebProcess/Plugins/PluginView.cpp b/WebKit2/WebProcess/Plugins/PluginView.cpp
index 42721f4..778619a 100644
--- a/WebKit2/WebProcess/Plugins/PluginView.cpp
+++ b/WebKit2/WebProcess/Plugins/PluginView.cpp
@@ -291,6 +291,10 @@ Frame* PluginView::frame()
 
 void PluginView::manualLoadDidReceiveResponse(const ResourceResponse& response)
 {
+    // The plug-in can be null here if it failed to initialize.
+    if (!m_plugin)
+        return;
+
     // Compute the stream related data from the resource response.
     const KURL& responseURL = response.url();
     const String& mimeType = response.mimeType();
@@ -307,16 +311,28 @@ void PluginView::manualLoadDidReceiveResponse(const ResourceResponse& response)
 
 void PluginView::manualLoadDidReceiveData(const char* bytes, int length)
 {
+    // The plug-in can be null here if it failed to initialize.
+    if (!m_plugin)
+        return;
+
     m_plugin->manualStreamDidReceiveData(bytes, length);
 }
 
 void PluginView::manualLoadDidFinishLoading()
 {
+    // The plug-in can be null here if it failed to initialize.
+    if (!m_plugin)
+        return;
+
     m_plugin->manualStreamDidFinishLoading();
 }
 
 void PluginView::manualLoadDidFail(const ResourceError& error)
 {
+    // The plug-in can be null here if it failed to initialize.
+    if (!m_plugin)
+        return;
+
     m_plugin->manualStreamDidFail(error.isCancellation());
 }
 

-- 
WebKit Debian packaging