Changeset 192850 in webkit

Timestamp:

Nov 30, 2015, 6:15:47 PM (10 years ago)

Author:

beidson@apple.com

Message:

Modern IDB: ObjectStore cursors should not be able to iterate out of their range.
​https://bugs.webkit.org/show_bug.cgi?id=151683

Reviewed by Darin Adler.

Source/WebCore:

No new tests (Covered by at least one failing test that now passes).

• Modules/indexeddb/server/MemoryObjectStoreCursor.cpp:

(WebCore::IDBServer::MemoryObjectStoreCursor::incrementForwardIterator):
(WebCore::IDBServer::MemoryObjectStoreCursor::incrementReverseIterator):

LayoutTests:

• platform/mac-wk1/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-wk1/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-11-30  Brady Eidson  <beidson@apple.com>
+
+        Modern IDB: ObjectStore cursors should not be able to iterate out of their range.
+        https://bugs.webkit.org/show_bug.cgi?id=151683
+
+        Reviewed by Darin Adler.
+
+        * platform/mac-wk1/TestExpectations:
+
 2015-11-30  Brady Eidson  <beidson@apple.com>
 

trunk/LayoutTests/platform/mac-wk1/TestExpectations

@@ -87 +87 @@
 storage/indexeddb/mozilla/cursor-mutation.html [ Pass ]
 storage/indexeddb/mozilla/cursor-update-updates-indexes.html [ Pass ]
+storage/indexeddb/mozilla/cursors.html [ Pass ]
 storage/indexeddb/mozilla/delete-result.html [ Pass ]
 storage/indexeddb/mozilla/event-source.html [ Pass ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-11-30  Brady Eidson  <beidson@apple.com>
+
+        Modern IDB: ObjectStore cursors should not be able to iterate out of their range.
+        https://bugs.webkit.org/show_bug.cgi?id=151683
+
+        Reviewed by Darin Adler.
+
+        No new tests (Covered by at least one failing test that now passes).
+
+        * Modules/indexeddb/server/MemoryObjectStoreCursor.cpp:
+        (WebCore::IDBServer::MemoryObjectStoreCursor::incrementForwardIterator):
+        (WebCore::IDBServer::MemoryObjectStoreCursor::incrementReverseIterator):
+
 2015-11-30  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.cpp

@@ -238 +238 @@
             return;
 
-        if (!m_info.range().containsKey(**m_forwardIterator))
-            return;
+        if (!m_info.range().containsKey(**m_forwardIterator)) {
+            m_forwardIterator = set.end();
+            return;
+        }
     }
 }
@@ -295 +297 @@
             return;
 
-        if (!m_info.range().containsKey(**m_reverseIterator))
-            return;
+        if (!m_info.range().containsKey(**m_reverseIterator)) {
+            m_reverseIterator = set.rend();
+            return;
+        }
     }
 }