Title: [92261] trunk/Source/WebCore
- Revision
- 92261
- Author
- psola...@apple.com
- Date
- 2011-08-02 22:07:51 -0700 (Tue, 02 Aug 2011)
Log Message
Crash in ResourceResponse::platformCompare() with USE(CFNETWORK)
https://bugs.webkit.org/show_bug.cgi?id=65584
Reviewed by David Kilzer.
* platform/network/cf/ResourceResponseCFNet.cpp:
(WebCore::ResourceResponse::platformCompare): Don't call CFEqual with 0 as an argument.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (92260 => 92261)
--- trunk/Source/WebCore/ChangeLog 2011-08-03 04:37:51 UTC (rev 92260)
+++ trunk/Source/WebCore/ChangeLog 2011-08-03 05:07:51 UTC (rev 92261)
@@ -1,3 +1,13 @@
+2011-08-02 Pratik Solanki <psola...@apple.com>
+
+ Crash in ResourceResponse::platformCompare() with USE(CFNETWORK)
+ https://bugs.webkit.org/show_bug.cgi?id=65584
+
+ Reviewed by David Kilzer.
+
+ * platform/network/cf/ResourceResponseCFNet.cpp:
+ (WebCore::ResourceResponse::platformCompare): Don't call CFEqual with 0 as an argument.
+
2011-08-02 Takashi Toyoshima <toyos...@chromium.org>
WebSocket: Should be closed by receiving invalid continuation frame.
Modified: trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp (92260 => 92261)
--- trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp 2011-08-03 04:37:51 UTC (rev 92260)
+++ trunk/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp 2011-08-03 05:07:51 UTC (rev 92261)
@@ -137,6 +137,9 @@
bool ResourceResponse::platformCompare(const ResourceResponse& a, const ResourceResponse& b)
{
+ // CFEqual crashes if you pass it 0 so do an early check before calling it.
+ if (!a.cfURLResponse() || !b.cfURLResponse())
+ return a.cfURLResponse() == b.cfURLResponse();
return CFEqual(a.cfURLResponse(), b.cfURLResponse());
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes