mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-07-07 00:39:13 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Validate bit args, formatting and removed read0Bits function

Browse Source
This commit is contained in:
Collin Smith
2020-07-28 04:36:58 -07:00
parent 25b428cb04
commit 148a8e108e
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/com/riiablo/codec/util/BitStream.java
View File

@ -2,6 +2,7 @@ package com.riiablo.codec.util;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import org.apache.commons.lang3.Validate;
import com.riiablo.util.BufferUtils; import com.riiablo.util.BufferUtils;
@ -115,6 +116,7 @@ public class BitStream {
} }
public long readUnsigned(int bits) { public long readUnsigned(int bits) {
Validate.inclusiveBetween(0, Long.SIZE, bits, "bits must be in range [0,64]");
if (bits == 0) return 0; if (bits == 0) return 0;
int curBytesPos = (int) (curBitPosition / Byte.SIZE); int curBytesPos = (int) (curBitPosition / Byte.SIZE);
int bitPosInCurByte = (int) (curBitPosition % Byte.SIZE); int bitPosInCurByte = (int) (curBitPosition % Byte.SIZE);
@ -152,23 +154,22 @@ public class BitStream {
assert bits <= Byte.SIZE - 1; assert bits <= Byte.SIZE - 1;
return (byte) readUnsigned(bits); return (byte) readUnsigned(bits);
} }
public int readUnsigned8OrLess(int bits) { public int readUnsigned8OrLess(int bits) {
assert bits <= Byte.SIZE; assert bits <= Byte.SIZE;
return (int) readUnsigned(bits); return (int) readUnsigned(bits);
} }
public short readUnsigned15OrLess(int bits) { public short readUnsigned15OrLess(int bits) {
assert bits <= Short.SIZE - 1; assert bits <= Short.SIZE - 1;
return (short) readUnsigned(bits); return (short) readUnsigned(bits);
} }
public int readUnsigned31OrLess(int bits) { public int readUnsigned31OrLess(int bits) {
assert bits < Integer.SIZE; assert bits < Integer.SIZE;
return (int) readUnsigned(bits); return (int) readUnsigned(bits);
} }
public int read0Bits() {
return 0;
}
public int readSigned(int bits) { public int readSigned(int bits) {
int shift = Integer.SIZE - bits; int shift = Integer.SIZE - bits;
return ((int) readUnsigned(bits)) << shift >> shift; return ((int) readUnsigned(bits)) << shift >> shift;