1 files changed, 12 insertions, 1 deletions
diff --git a/Minecraft.World/ByteArrayInputStream.cpp b/Minecraft.World/ByteArrayInputStream.cpp
index d79eff36..9509206d 100644
--- a/Minecraft.World/ByteArrayInputStream.cpp
+++ b/Minecraft.World/ByteArrayInputStream.cpp
@@ -10,8 +10,19 @@
 //offset - the offset in the buffer of the first byte to read.
 //length - the maximum number of bytes to read from the buffer.
 ByteArrayInputStream::ByteArrayInputStream(byteArray buf, unsigned int offset, unsigned int length)
-	: pos( offset ), count( min( offset+length, buf.length ) ), mark( offset )
+    : pos(offset), mark(offset)
 {
+    if (offset > buf.length)
+    {
+        count = buf.length;
+    }
+    else if (length > buf.length - offset)
+    {
+        count = buf.length;
+    }
+    else
+    {
+        count = offset + length;
 	this->buf = buf;
 }