Changeset 69442 in webkit

Timestamp:

Oct 9, 2010 12:11:08 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-10-09 Pratik Solanki <​psolanki@apple.com>

Reviewed by Dan Bernstein.

​https://bugs.webkit.org/show_bug.cgi?id=47450
Crash in WebCore::SocketStreamHandle::chooseProxyFromArray because proxyArray passed is nil
<rdar://problem/8244376>

• platform/network/cf/SocketStreamHandleCFNet.cpp: (WebCore::SocketStreamHandle::chooseProxyFromArray): If proxyArray is NULL, return early to avoid crash.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/cf/SocketStreamHandleCFNet.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-09  Pratik Solanki  <psolanki@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=47450
+        Crash in WebCore::SocketStreamHandle::chooseProxyFromArray because proxyArray passed is nil
+        <rdar://problem/8244376>
+
+        * platform/network/cf/SocketStreamHandleCFNet.cpp:
+        (WebCore::SocketStreamHandle::chooseProxyFromArray): If proxyArray is
+        NULL, return early to avoid crash.
+
 2010-10-08  Chris Rogers  <crogers@google.com>
 

trunk/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp

@@ -195 +195 @@
 void SocketStreamHandle::chooseProxyFromArray(CFArrayRef proxyArray)
 {
-    if (!proxyArray)
+    if (!proxyArray) {
         m_connectionType = Direct;
+        return;
+    }
 
     CFIndex proxyArrayCount = CFArrayGetCount(proxyArray);