PageCursor.setOffset now bounds checks

This is to uphold the assumptions of the nextBoundedPointer method, which expects the offset field to at least never underflow.
neo4j · May 26, 2017 · f8699ff · f8699ff
1 parent a0abeff
commit f8699ff
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/community/io/src/main/java/org/neo4j/io/pagecache/impl/muninn/MuninnPageCursor.java b/community/io/src/main/java/org/neo4j/io/pagecache/impl/muninn/MuninnPageCursor.java
@@ -750,6 +750,11 @@ public int copyTo( int sourceOffset, PageCursor targetCursor, int targetOffset,
     public void setOffset( int offset )
     {
         this.offset = offset;
+        if ( offset < 0 | offset > filePageSize )
+        {
+            this.offset = 0;
+            outOfBounds = true;
+        }
     }
 
     @Override

diff --git a/community/io/src/test/java/org/neo4j/io/pagecache/PageCacheTest.java b/community/io/src/test/java/org/neo4j/io/pagecache/PageCacheTest.java
@@ -3205,7 +3205,7 @@ public void nextWithPageIdMustNotClearBoundsFlagOnWriteCursor() throws Exception
     }
 
     @Test( timeout = SHORT_TIMEOUT_MILLIS )
-    public void settingOutOfBoundsCursorOffsetMustNotRaiseBoundsFlag() throws IOException
+    public void settingOutOfBoundsCursorOffsetMustRaiseBoundsFlag() throws IOException
     {
         generateFileWithRecords( file( "a" ), 1, recordSize );
 
@@ -3214,12 +3214,15 @@ public void settingOutOfBoundsCursorOffsetMustNotRaiseBoundsFlag() throws IOExce
               PageCursor cursor = pagedFile.io( 0, PF_SHARED_READ_LOCK ) )
         {
             cursor.setOffset( -1 );
+            assertTrue( cursor.checkAndClearBoundsFlag() );
             assertFalse( cursor.checkAndClearBoundsFlag() );
 
             cursor.setOffset( filePageSize + 1 );
+            assertTrue( cursor.checkAndClearBoundsFlag() );
             assertFalse( cursor.checkAndClearBoundsFlag() );
 
             cursor.setOffset( pageCachePageSize + 1 );
+            assertTrue( cursor.checkAndClearBoundsFlag() );
             assertFalse( cursor.checkAndClearBoundsFlag() );
         }
     }