Changeset 64942 in webkit

Timestamp:

Aug 7, 2010 11:58:14 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-08-07 Adam Barth <​abarth@webkit.org>

Reviewed by Sam Weinig.

Empty strings can have more than one ref
​https://bugs.webkit.org/show_bug.cgi?id=43666

These asserts are trying to say that we have a thread-safe copy of the
string, but they're not accurate for empty strings because we use a
special static empty string that magically has infinite refs.

• storage/OriginUsageRecord.cpp: (WebCore::OriginUsageRecord::addDatabase): (WebCore::OriginUsageRecord::markDatabase):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• storage/OriginUsageRecord.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-07  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Sam Weinig.
+
+        Empty strings can have more than one ref
+        https://bugs.webkit.org/show_bug.cgi?id=43666
+
+        These asserts are trying to say that we have a thread-safe copy of the
+        string, but they're not accurate for empty strings because we use a
+        special static empty string that magically has infinite refs.
+
+        * storage/OriginUsageRecord.cpp:
+        (WebCore::OriginUsageRecord::addDatabase):
+        (WebCore::OriginUsageRecord::markDatabase):
+
 2010-08-07  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
         Reviewed by Eric Seidel.

trunk/WebCore/storage/OriginUsageRecord.cpp

@@ -43 +43 @@
 {
     ASSERT(!m_databaseMap.contains(identifier));
-    ASSERT_ARG(identifier, identifier.impl()->hasOneRef());
-    ASSERT_ARG(fullPath, fullPath.impl()->hasOneRef());
+    ASSERT_ARG(identifier, identifier.impl()->hasOneRef() || identifier.isEmpty());
+    ASSERT_ARG(fullPath, fullPath.impl()->hasOneRef() || fullPath.isEmpty());
 
     m_databaseMap.set(identifier, DatabaseEntry(fullPath));
@@ -64 +64 @@
 {
     ASSERT(m_databaseMap.contains(identifier));
-    ASSERT_ARG(identifier, identifier.impl()->hasOneRef());
+    ASSERT_ARG(identifier, identifier.impl()->hasOneRef() || identifier.isEmpty());
 
     m_unknownSet.add(identifier);