Title: [175091] branches/safari-600.1.4.12-branch/Source/WebKit2
- Revision
- 175091
- Author
- [email protected]
- Date
- 2014-10-23 00:03:11 -0700 (Thu, 23 Oct 2014)
Log Message
Merged r174512. rdar://problem/18742317
Modified Paths
Diff
Modified: branches/safari-600.1.4.12-branch/Source/WebKit2/ChangeLog (175090 => 175091)
--- branches/safari-600.1.4.12-branch/Source/WebKit2/ChangeLog 2014-10-23 07:01:02 UTC (rev 175090)
+++ branches/safari-600.1.4.12-branch/Source/WebKit2/ChangeLog 2014-10-23 07:03:11 UTC (rev 175091)
@@ -1,3 +1,19 @@
+2014-10-23 Babak Shafiei <[email protected]>
+
+ Merge r174512.
+
+ 2014-10-09 Andy Estes <[email protected]>
+
+ [iOS] Crash in CFURLDownloadClient.didFail if the download has a null resumeData
+ https://bugs.webkit.org/show_bug.cgi?id=137551
+
+ Reviewed by David Kilzer.
+
+ CFDataGetBytePtr() and CFDataGetLength() crash if passed a null value.
+
+ * Shared/Downloads/ios/DownloadIOS.mm:
+ (WebKit::setUpDownloadClient):
+
2014-09-22 Babak Shafiei <[email protected]>
Merge r173788.
Modified: branches/safari-600.1.4.12-branch/Source/WebKit2/Shared/Downloads/ios/DownloadIOS.mm (175090 => 175091)
--- branches/safari-600.1.4.12-branch/Source/WebKit2/Shared/Downloads/ios/DownloadIOS.mm 2014-10-23 07:01:02 UTC (rev 175090)
+++ branches/safari-600.1.4.12-branch/Source/WebKit2/Shared/Downloads/ios/DownloadIOS.mm 2014-10-23 07:03:11 UTC (rev 175091)
@@ -117,7 +117,7 @@
client.didFail = [](CFURLDownloadRef downloadRef, CFErrorRef error, const void* clientInfo) {
dispatchOnMainThread(^{
auto resumeData = adoptCF(CFURLDownloadCopyResumeData(downloadRef));
- toDownload(clientInfo)->didFail(error, IPC::DataReference(CFDataGetBytePtr(resumeData.get()), CFDataGetLength(resumeData.get())));
+ toDownload(clientInfo)->didFail(error, IPC::DataReference(resumeData ? CFDataGetBytePtr(resumeData.get()) : nullptr, resumeData ? CFDataGetLength(resumeData.get()) : 0));
});
};
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
