add asserts. patch by jbellis for CASSANDRA-466

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.4@821174 13f79535-47bb-0310-9956-ffa450edef68
apache · Oct 2, 2009 · f264871 · f264871
1 parent f629a26
commit f264871
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/java/org/apache/cassandra/io/IndexHelper.java b/src/java/org/apache/cassandra/io/IndexHelper.java
@@ -60,7 +60,8 @@ public static int skipBloomFilter(DataInput in) throws IOException
         int size = in.readInt();
         totalBytesRead += 4;
         /* skip the serialized bloom filter */
-        in.skipBytes(size);
+        if (in.skipBytes(size) != size)
+            throw new EOFException();
         totalBytesRead += size;
         return totalBytesRead;
     }
@@ -78,7 +79,8 @@ private static int skipIndex(DataInput file) throws IOException
         int totalBytesRead = 4;
 
         /* skip the column index data */
-        file.skipBytes(columnIndexSize);
+        if (file.skipBytes(columnIndexSize) != columnIndexSize)
+            throw new EOFException();
         totalBytesRead += columnIndexSize;
 
         return totalBytesRead;

diff --git a/src/java/org/apache/cassandra/io/SSTableWriter.java b/src/java/org/apache/cassandra/io/SSTableWriter.java
@@ -97,6 +97,7 @@ public void append(String decoratedKey, DataOutputBuffer buffer) throws IOExcept
         long currentPosition = beforeAppend(decoratedKey);
         dataFile.writeUTF(decoratedKey);
         int length = buffer.getLength();
+        assert length > 0;
         dataFile.writeInt(length);
         dataFile.write(buffer.getData(), 0, length);
         afterAppend(decoratedKey, currentPosition);
@@ -106,6 +107,7 @@ public void append(String decoratedKey, byte[] value) throws IOException
     {
         long currentPosition = beforeAppend(decoratedKey);
         dataFile.writeUTF(decoratedKey);
+        assert value.length > 0;
         dataFile.writeInt(value.length);
         dataFile.write(value);
         afterAppend(decoratedKey, currentPosition);