mirror/bd-jb
1
0
Fork 0
mirror of https://github.com/TheOfficialFloW/bd-jb synced 2025-02-16 07:10:15 -05:00
Code Issues Projects Releases Wiki Activity

Improve bounds checking.

Browse Source
This commit is contained in:
Andy Nguyen 2021-11-06 12:34:39 +01:00
parent ae092232a1
commit 3347cbb544
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/bdjb/api/Buffer.java
View File

@ -40,42 +40,42 @@ public class Buffer {
} }
public byte getByte(int offset) { public byte getByte(int offset) {
checkOffset(offset); checkOffset(offset, Int8.SIZE);
return api.read8(address + offset); return api.read8(address + offset);
} }
public short getShort(int offset) { public short getShort(int offset) {
checkOffset(offset); checkOffset(offset, Int16.SIZE);
return api.read16(address + offset); return api.read16(address + offset);
} }
public int getInt(int offset) { public int getInt(int offset) {
checkOffset(offset); checkOffset(offset, Int32.SIZE);
return api.read32(address + offset); return api.read32(address + offset);
} }
public long getLong(int offset) { public long getLong(int offset) {
checkOffset(offset); checkOffset(offset, Int64.SIZE);
return api.read64(address + offset); return api.read64(address + offset);
} }
public void putByte(int offset, byte value) { public void putByte(int offset, byte value) {
checkOffset(offset); checkOffset(offset, Int8.SIZE);
api.write8(address + offset, value); api.write8(address + offset, value);
} }
public void putShort(int offset, short value) { public void putShort(int offset, short value) {
checkOffset(offset); checkOffset(offset, Int16.SIZE);
api.write16(address + offset, value); api.write16(address + offset, value);
} }
public void putInt(int offset, int value) { public void putInt(int offset, int value) {
checkOffset(offset); checkOffset(offset, Int32.SIZE);
api.write32(address + offset, value); api.write32(address + offset, value);
} }
public void putLong(int offset, long value) { public void putLong(int offset, long value) {
checkOffset(offset); checkOffset(offset, Int64.SIZE);
api.write64(address + offset, value); api.write64(address + offset, value);
} }
@ -83,8 +83,8 @@ public class Buffer {
api.memset(address, value, size); api.memset(address, value, size);
} }
private void checkOffset(int offset) { private void checkOffset(int offset, int length) {
if (offset < 0 || offset >= size) { if (offset < 0 || (offset + length) > size) {
throw new IndexOutOfBoundsException(); throw new IndexOutOfBoundsException();
} }
} }

2
src/com/bdjb/api/IntBase.java
View File

@ -72,7 +72,7 @@ abstract class IntBase {
} }
private void checkOffset(int offset) { private void checkOffset(int offset) {
if (offset < 0 || offset >= size) { if (offset < 0 || (offset + elementSize()) > size) {
throw new IndexOutOfBoundsException(); throw new IndexOutOfBoundsException();
} }
} }