Title: [159471] trunk/Source/WebKit2
- Revision
- 159471
- Author
- [email protected]
- Date
- 2013-11-18 16:46:39 -0800 (Mon, 18 Nov 2013)
Log Message
TestWebKitAPI crashes when running under GuardMalloc
https://bugs.webkit.org/show_bug.cgi?id=124546
Reviewed by Tim Horton.
* UIProcess/Downloads/DownloadProxyMap.cpp:
(WebKit::DownloadProxyMap::downloadFinished):
Grab the download ID before removing the DownloadProxy from the map.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (159470 => 159471)
--- trunk/Source/WebKit2/ChangeLog 2013-11-19 00:45:03 UTC (rev 159470)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-19 00:46:39 UTC (rev 159471)
@@ -1,3 +1,14 @@
+2013-11-18 Anders Carlsson <[email protected]>
+
+ TestWebKitAPI crashes when running under GuardMalloc
+ https://bugs.webkit.org/show_bug.cgi?id=124546
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/Downloads/DownloadProxyMap.cpp:
+ (WebKit::DownloadProxyMap::downloadFinished):
+ Grab the download ID before removing the DownloadProxy from the map.
+
2013-11-18 Ryuan Choi <[email protected]>
Unreviewed build fix attempt on GTK and EFL port after r159461
Modified: trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.cpp (159470 => 159471)
--- trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.cpp 2013-11-19 00:45:03 UTC (rev 159470)
+++ trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxyMap.cpp 2013-11-19 00:46:39 UTC (rev 159471)
@@ -56,12 +56,14 @@
void DownloadProxyMap::downloadFinished(DownloadProxy* downloadProxy)
{
- ASSERT(m_downloads.contains(downloadProxy->downloadID()));
+ uint64_t downloadID = downloadProxy->downloadID();
+ ASSERT(m_downloads.contains(downloadID));
+
downloadProxy->invalidate();
- m_downloads.remove(downloadProxy->downloadID());
+ m_downloads.remove(downloadID);
- m_process->removeMessageReceiver(Messages::DownloadProxy::messageReceiverName(), downloadProxy->downloadID());
+ m_process->removeMessageReceiver(Messages::DownloadProxy::messageReceiverName(), downloadID);
}
void DownloadProxyMap::processDidClose()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes