Title: [151409] trunk/Source/WebKit2
- Revision
- 151409
- Author
- [email protected]
- Date
- 2013-06-10 16:43:38 -0700 (Mon, 10 Jun 2013)
Log Message
Crash in StorageAreaMap::applyChange when clearing local storage in another web process
https://bugs.webkit.org/show_bug.cgi?id=117440
<rdar://problem/13961548>
Reviewed by Tim Horton.
Add an early return so we won't try to look up a null key in the m_pendingValueChanges map.
Also, fix an assertion - it's fine for m_storageMap to be null in applyChange.
* WebProcess/Storage/StorageAreaMap.cpp:
(WebKit::StorageAreaMap::applyChange):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (151408 => 151409)
--- trunk/Source/WebKit2/ChangeLog 2013-06-10 23:16:02 UTC (rev 151408)
+++ trunk/Source/WebKit2/ChangeLog 2013-06-10 23:43:38 UTC (rev 151409)
@@ -1,3 +1,17 @@
+2013-06-10 Anders Carlsson <[email protected]>
+
+ Crash in StorageAreaMap::applyChange when clearing local storage in another web process
+ https://bugs.webkit.org/show_bug.cgi?id=117440
+ <rdar://problem/13961548>
+
+ Reviewed by Tim Horton.
+
+ Add an early return so we won't try to look up a null key in the m_pendingValueChanges map.
+ Also, fix an assertion - it's fine for m_storageMap to be null in applyChange.
+
+ * WebProcess/Storage/StorageAreaMap.cpp:
+ (WebKit::StorageAreaMap::applyChange):
+
2013-06-10 Sergio Correia <[email protected]>
[WK2][CoordinatedGraphics] Add default case to switches to fix strict build
Modified: trunk/Source/WebKit2/WebProcess/Storage/StorageAreaMap.cpp (151408 => 151409)
--- trunk/Source/WebKit2/WebProcess/Storage/StorageAreaMap.cpp 2013-06-10 23:16:02 UTC (rev 151408)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageAreaMap.cpp 2013-06-10 23:43:38 UTC (rev 151409)
@@ -240,7 +240,7 @@
void StorageAreaMap::applyChange(const String& key, const String& newValue)
{
- ASSERT(m_storageMap->hasOneRef());
+ ASSERT(!m_storageMap || m_storageMap->hasOneRef());
// There's a clear pending or getValues pending we don't want to apply any changes until we get the corresponding DidClear/DidGetValues messages.
if (m_hasPendingClear || m_hasPendingGetValues)
@@ -265,6 +265,7 @@
}
m_storageMap = newStorageMap.release();
+ return;
}
if (!shouldApplyChangeForKey(key))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes