Title: [103686] trunk/Source/WebKit2
- Revision
- 103686
- Author
- [email protected]
- Date
- 2011-12-26 07:58:11 -0800 (Mon, 26 Dec 2011)
Log Message
Fix a crash in WebProcess when starting a download not initiated by a WebPage
https://bugs.webkit.org/show_bug.cgi?id=75225
Reviewed by Darin Adler.
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::downloadRequest): Check initiatingPage is not
NULL before using it.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (103685 => 103686)
--- trunk/Source/WebKit2/ChangeLog 2011-12-26 15:21:39 UTC (rev 103685)
+++ trunk/Source/WebKit2/ChangeLog 2011-12-26 15:58:11 UTC (rev 103686)
@@ -1,3 +1,14 @@
+2011-12-26 Carlos Garcia Campos <[email protected]>
+
+ Fix a crash in WebProcess when starting a download not initiated by a WebPage
+ https://bugs.webkit.org/show_bug.cgi?id=75225
+
+ Reviewed by Darin Adler.
+
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::downloadRequest): Check initiatingPage is not
+ NULL before using it.
+
2011-12-25 Dan Bernstein <[email protected]>
Find indicators overlap when a match spans multiple text boxes
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (103685 => 103686)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2011-12-26 15:21:39 UTC (rev 103685)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2011-12-26 15:58:11 UTC (rev 103686)
@@ -960,7 +960,8 @@
WebPage* initiatingPage = initiatingPageID ? webPage(initiatingPageID) : 0;
ResourceRequest requestWithOriginalURL = request;
- initiatingPage->mainFrame()->loader()->setOriginalURLForDownloadRequest(requestWithOriginalURL);
+ if (initiatingPage)
+ initiatingPage->mainFrame()->loader()->setOriginalURLForDownloadRequest(requestWithOriginalURL);
DownloadManager::shared().startDownload(downloadID, initiatingPage, requestWithOriginalURL);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
