Title: [130834] trunk/Source/WebCore
Revision
130834
Author
commit-qu...@webkit.org
Date
2012-10-09 18:23:11 -0700 (Tue, 09 Oct 2012)

Log Message

Check for null m_frame in NetworkJob
https://bugs.webkit.org/show_bug.cgi?id=98830

Patch by Joe Mason <jma...@rim.com> on 2012-10-09
Reviewed by George Staikos.

PR 220025

* platform/network/blackberry/NetworkJob.cpp:
(WebCore::NetworkJob::sendRequestWithCredentials):
(WebCore::NetworkJob::storeCredentials):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (130833 => 130834)


--- trunk/Source/WebCore/ChangeLog	2012-10-10 01:21:49 UTC (rev 130833)
+++ trunk/Source/WebCore/ChangeLog	2012-10-10 01:23:11 UTC (rev 130834)
@@ -1,3 +1,16 @@
+2012-10-09  Joe Mason  <jma...@rim.com>
+
+        Check for null m_frame in NetworkJob
+        https://bugs.webkit.org/show_bug.cgi?id=98830
+
+        Reviewed by George Staikos.
+
+        PR 220025
+
+        * platform/network/blackberry/NetworkJob.cpp:
+        (WebCore::NetworkJob::sendRequestWithCredentials):
+        (WebCore::NetworkJob::storeCredentials):
+
 2012-10-09  Jian Li  <jia...@chromium.org>
 
         Update the CSS property used to support draggable regions.

Modified: trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp (130833 => 130834)


--- trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp	2012-10-10 01:21:49 UTC (rev 130833)
+++ trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp	2012-10-10 01:23:11 UTC (rev 130834)
@@ -780,6 +780,9 @@
             if (m_handle->firstRequest().targetType() != ResourceRequest::TargetIsMainFrame && BlackBerry::Platform::Settings::instance()->isChromeProcess())
                 return false;
 
+            if (!m_frame || !m_frame->page())
+                return false;
+
             m_handle->getInternal()->m_currentWebChallenge = AuthenticationChallenge();
             m_frame->page()->chrome()->client()->platformPageClient()->authenticationChallenge(newURL, protectionSpace, Credential(), this);
             return true;
@@ -812,7 +815,8 @@
     if (challenge.protectionSpace().serverType() == ProtectionSpaceProxyHTTP) {
         BlackBerry::Platform::Settings::instance()->setProxyCredential(challenge.proposedCredential().user().utf8().data(),
                                                                 challenge.proposedCredential().password().utf8().data());
-        m_frame->page()->chrome()->client()->platformPageClient()->syncProxyCredential(challenge.proposedCredential());
+        if (m_frame && m_frame->page())
+            m_frame->page()->chrome()->client()->platformPageClient()->syncProxyCredential(challenge.proposedCredential());
     }
 }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to