[infinispan-commits] Infinispan SVN: r2152 - branches/4.1.x/lucene-directory/src/main/java/org/infinispan/lucene.

[infinispan-commits at lists.jboss.org]

Author: sannegrinovero
Date: 2010-08-04 07:12:15 -0400 (Wed, 04 Aug 2010)
New Revision: 2152

Modified:
   branches/4.1.x/lucene-directory/src/main/java/org/infinispan/lucene/SingleChunkIndexInput.java
Log:
[ISPN-568] (Lucene needs boundary checks in buffer copy of readBytes()) branch 4.1

Modified: branches/4.1.x/lucene-directory/src/main/java/org/infinispan/lucene/SingleChunkIndexInput.java
===================================================================
--- branches/4.1.x/lucene-directory/src/main/java/org/infinispan/lucene/SingleChunkIndexInput.java	2010-08-04 10:58:52 UTC (rev 2151)
+++ branches/4.1.x/lucene-directory/src/main/java/org/infinispan/lucene/SingleChunkIndexInput.java	2010-08-04 11:12:15 UTC (rev 2152)
@@ -69,11 +69,15 @@
 
    @Override
    public byte readByte() throws IOException {
+      if (bufferPosition >= buffer.length) {
+         throw new IOException("Read past EOF");
+      }
       return buffer[bufferPosition++];
    }
 
    @Override
    public void readBytes(byte[] b, int offset, int len) throws IOException {
+      len = Math.min(len, buffer.length - bufferPosition);
       System.arraycopy(buffer, bufferPosition, b, offset, len);
       bufferPosition+=len;
    }