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

[jam at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit d879a51d50dc5a9a9b8459af023998d9bf4fc7a0
Author: jam at chromium.org <jam at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 15 02:54:40 2010 +0000

    2010-10-14  John Abd-El-Malek  <jam at chromium.org>
    
            Reviewed by Tony Chang.
    
            [chromium] null check the widget before sending it data as calling didReceiveData might delete it
            https://bugs.webkit.org/show_bug.cgi?id=47708
    
            * src/FrameLoaderClientImpl.cpp:
            (WebKit::FrameLoaderClientImpl::committedLoad):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69834 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index e0f298c..06b208b 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-14  John Abd-El-Malek  <jam at chromium.org>
+
+        Reviewed by Tony Chang.
+
+        [chromium] null check the widget before sending it data as calling didReceiveData might delete it
+        https://bugs.webkit.org/show_bug.cgi?id=47708
+
+        * src/FrameLoaderClientImpl.cpp:
+        (WebKit::FrameLoaderClientImpl::committedLoad):
+
 2010-10-14  Tony Chang  <tony at chromium.org>
 
         Reviewed by Kent Tamura.
diff --git a/WebKit/chromium/src/FrameLoaderClientImpl.cpp b/WebKit/chromium/src/FrameLoaderClientImpl.cpp
index fb798f6..829b670 100644
--- a/WebKit/chromium/src/FrameLoaderClientImpl.cpp
+++ b/WebKit/chromium/src/FrameLoaderClientImpl.cpp
@@ -1072,7 +1072,11 @@ void FrameLoaderClientImpl::committedLoad(DocumentLoader* loader, const char* da
             m_pluginWidget->didReceiveResponse(
                 m_webFrame->frame()->loader()->activeDocumentLoader()->response());
         }
-        m_pluginWidget->didReceiveData(data, length);
+
+        // It's possible that the above call removed the pointer to the plugin, so
+        // check before calling it.
+        if (m_pluginWidget.get())
+            m_pluginWidget->didReceiveData(data, length);
     }
 }
 

-- 
WebKit Debian packaging