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

[ap at apple.com]

The following commit has been merged in the debian/experimental branch:
commit d663a855cb5ad85ff2cd5ed7b2ec4e55cba4c856
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 14 00:20:04 2010 +0000

            Reviewed by Darin Adler.
    
            https://bugs.webkit.org/show_bug.cgi?id=42216
            ResourceRequest::doUpdateResourceRequest() crashes if client denied request
    
            This is covered by many regression tests with patch for bug 42201 applied (because it makes
            us also use this code path for sync requests, and those currently have more strict limitations).
    
            * platform/network/cf/ResourceRequestCFNet.cpp:
            (WebCore::ResourceRequest::doUpdateResourceRequest): Added a null check.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63265 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a97cf4c..cc8714b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-13  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=42216
+        ResourceRequest::doUpdateResourceRequest() crashes if client denied request
+
+        This is covered by many regression tests with patch for bug 42201 applied (because it makes
+        us also use this code path for sync requests, and those currently have more strict limitations).
+
+        * platform/network/cf/ResourceRequestCFNet.cpp:
+        (WebCore::ResourceRequest::doUpdateResourceRequest): Added a null check.
+
 2010-07-13  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/platform/network/cf/ResourceRequestCFNet.cpp b/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
index cc0220e..8e15040 100644
--- a/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
+++ b/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
@@ -146,6 +146,11 @@ void ResourceRequest::doUpdatePlatformRequest()
 
 void ResourceRequest::doUpdateResourceRequest()
 {
+    if (!m_cfRequest) {
+        *this = ResourceRequest();
+        return;
+    }
+
     m_url = CFURLRequestGetURL(m_cfRequest.get());
 
     m_cachePolicy = (ResourceRequestCachePolicy)CFURLRequestGetCachePolicy(m_cfRequest.get());

-- 
WebKit Debian packaging