Safe StringLayout.readKey

neo4j · Feb 15, 2018 · 6bd0c15 · 6bd0c15
1 parent 2688a4c
commit 6bd0c15
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringLayout.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/StringLayout.java
@@ -23,7 +23,6 @@
 import org.neo4j.io.pagecache.PageCursor;
 
 import static java.lang.String.format;
-
 import static org.neo4j.kernel.impl.index.schema.StringSchemaKey.ENTITY_ID_SIZE;
 
 /**
@@ -81,6 +80,11 @@ public void writeValue( PageCursor cursor, NativeSchemaValue value )
     public void readKey( PageCursor cursor, StringSchemaKey into, int keySize )
     {
         // TODO consider reusing byte[] instances somehow
+        if ( keySize < ENTITY_ID_SIZE )
+        {
+            into.bytes = null;
+            return;
+        }
         into.setEntityId( cursor.getLong() );
         into.bytes = new byte[keySize - ENTITY_ID_SIZE];
         cursor.getBytes( into.bytes );