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

[paroga at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 435266c0a0dc5a1220a4e7891a29544a188c9242
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 23 20:10:56 2010 +0000

    2010-09-23  Patrick Gansterer  <paroga at webkit.org>
    
            Reviewed by Adam Roben.
    
            Check for a valid ResourceHandleClient in ResourceHandleWin
            https://bugs.webkit.org/show_bug.cgi?id=46389
    
            * platform/network/win/ResourceHandleWin.cpp:
            (WebCore::ResourceHandle::onRequestComplete): Add checks to ensure client() is not 0.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68185 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e283323..ae24c31 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Adam Roben.
 
+        Check for a valid ResourceHandleClient in ResourceHandleWin
+        https://bugs.webkit.org/show_bug.cgi?id=46389
+
+        * platform/network/win/ResourceHandleWin.cpp:
+        (WebCore::ResourceHandle::onRequestComplete): Add checks to ensure client() is not 0.
+
+2010-09-23  Patrick Gansterer  <paroga at webkit.org>
+
+        Reviewed by Adam Roben.
+
         Fix ResourceHandleWin::cancel() for network resources 
         https://bugs.webkit.org/show_bug.cgi?id=46383
 
diff --git a/WebCore/platform/network/win/ResourceHandleWin.cpp b/WebCore/platform/network/win/ResourceHandleWin.cpp
index 4a34116..5384006 100644
--- a/WebCore/platform/network/win/ResourceHandleWin.cpp
+++ b/WebCore/platform/network/win/ResourceHandleWin.cpp
@@ -380,16 +380,21 @@ bool ResourceHandle::onRequestComplete()
                 response.setTextEncodingName(extractCharsetFromMediaType(httpContentType));
             }
 
-            client()->didReceiveResponse(this, response);
+            if (ResourceHandleClient* resourceHandleClient = client())
+                resourceHandleClient->didReceiveResponse(this, response);
         }
-        client()->didReceiveData(this, buffer, buffers.dwBufferLength, 0);
+
+        if (ResourceHandleClient* resourceHandleClient = client())
+            resourceHandleClient->didReceiveData(this, buffer, buffers.dwBufferLength, 0);
         buffers.dwBufferLength = bufferSize;
     }
 
     if (!ok && GetLastError() == ERROR_IO_PENDING)
         return true;
 
-    client()->didFinishLoading(this, 0);
+    if (ResourceHandleClient* resourceHandleClient = client())
+        resourceHandleClient->didFinishLoading(this, 0);
+
     InternetCloseHandle(d->m_requestHandle);
     InternetCloseHandle(d->m_connectHandle);
     deref(); // balances ref in start

-- 
WebKit Debian packaging