Title: [174258] tags/Safari-601.1.2/Source/WebCore
- Revision
- 174258
- Author
- bshaf...@apple.com
- Date
- 2014-10-02 23:15:14 -0700 (Thu, 02 Oct 2014)
Log Message
Merged r174252. <rdar://problem/18531395>
Modified Paths
Diff
Modified: tags/Safari-601.1.2/Source/WebCore/ChangeLog (174257 => 174258)
--- tags/Safari-601.1.2/Source/WebCore/ChangeLog 2014-10-03 05:39:09 UTC (rev 174257)
+++ tags/Safari-601.1.2/Source/WebCore/ChangeLog 2014-10-03 06:15:14 UTC (rev 174258)
@@ -1,3 +1,18 @@
+2014-10-02 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r174252. <rdar://problem/18531395>
+
+ 2014-10-02 Dan Bernstein <m...@apple.com>
+
+ <rdar://problem/18531395> REGRESSION (r173272): Crash in ResourceResponse::platformSuggestedFilename() when called on the null response
+ https://bugs.webkit.org/show_bug.cgi?id=137239
+
+ Reviewed by Pratik Solanki.
+
+ * platform/network/cf/ResourceResponseCFNet.cpp:
+ (WebCore::ResourceResponse::platformSuggestedFilename): Return the null String if
+ m_cfResponse is null.
+
2014-09-30 Brian J. Burg <b...@cs.washington.edu>
Web Inspector: ErrorString should be passed by reference
Modified: tags/Safari-601.1.2/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp (174257 => 174258)
--- tags/Safari-601.1.2/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp 2014-10-03 05:39:09 UTC (rev 174257)
+++ tags/Safari-601.1.2/Source/WebCore/platform/network/cf/ResourceResponseCFNet.cpp 2014-10-03 06:15:14 UTC (rev 174258)
@@ -120,6 +120,9 @@
String ResourceResponse::platformSuggestedFilename() const
{
+ if (!m_cfResponse)
+ return String();
+
RetainPtr<CFStringRef> suggestedFilename = adoptCF(CFURLResponseCopySuggestedFilename(m_cfResponse.get()));
return suggestedFilename.get();
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
