Skip to content
This repository was archived by the owner on Jul 6, 2020. It is now read-only.

Commit ced4220

Browse files
committed
Fix index out of bounds
1 parent d74d440 commit ced4220

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

common-memory/src/main/java/com/ardikars/common/memory/DirectMemory.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public DirectMemory capacity(int newCapacity) {
4747
@Override
4848
public DirectMemory getBytes(int index, Memory dst, int dstIndex, int length) {
4949
ensureAccessible();
50-
index = baseIndex + index;
50+
// index = baseIndex + index;
5151
checkDstIndex(index, length, dstIndex, dst.capacity());
5252
dst.setBytes(dstIndex, this, index, length);
5353
return this;
@@ -56,7 +56,7 @@ public DirectMemory getBytes(int index, Memory dst, int dstIndex, int length) {
5656
@Override
5757
public DirectMemory getBytes(int index, byte[] dst, int dstIndex, int length) {
5858
ensureAccessible();
59-
index = baseIndex + index;
59+
// index = baseIndex + index;
6060
checkDstIndex(index, length, dstIndex, dst.length);
6161
ByteBuffer tmpBuf = buffer.duplicate();
6262
tmpBuf.clear().position(index).limit(index + length);
@@ -116,7 +116,7 @@ public DirectMemory setLongLE(int index, long value) {
116116
@Override
117117
public DirectMemory setBytes(int index, Memory src, int srcIndex, int length) {
118118
ensureAccessible();
119-
index = baseIndex + index;
119+
// index = baseIndex + index;
120120
checkSrcIndex(index, length, srcIndex, src.capacity());
121121
for (int i = 0; i < length; i++) {
122122
buffer.put(index++, src.getByte(srcIndex++));
@@ -127,7 +127,7 @@ public DirectMemory setBytes(int index, Memory src, int srcIndex, int length) {
127127
@Override
128128
public DirectMemory setBytes(int index, byte[] src, int srcIndex, int length) {
129129
ensureAccessible();
130-
index = baseIndex + index;
130+
// index = baseIndex + index;
131131
checkSrcIndex(index, length, srcIndex, src.length);
132132
byte[] bytesSrc = Arrays.copyOfRange(src, srcIndex, srcIndex + length);
133133
int pos = buffer.position();

common-memory/src/main/java/com/ardikars/common/memory/HeapMemory.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public HeapMemory capacity(int newCapacity) {
4141
@Override
4242
public HeapMemory getBytes(int index, Memory dst, int dstIndex, int length) {
4343
ensureAccessible();
44-
index = baseIndex + index;
44+
// index = baseIndex + index;
4545
checkDstIndex(index, length, dstIndex, dst.capacity());
4646
dst.setBytes(dstIndex, this, index, length);
4747
return this;
@@ -50,7 +50,7 @@ public HeapMemory getBytes(int index, Memory dst, int dstIndex, int length) {
5050
@Override
5151
public HeapMemory getBytes(int index, byte[] dst, int dstIndex, int length) {
5252
ensureAccessible();
53-
index = baseIndex + index;
53+
// index = baseIndex + index;
5454
checkDstIndex(index, length, dstIndex, dst.length);
5555
ByteBuffer tmpBuf = buffer.duplicate();
5656
tmpBuf.clear().position(index).limit(index + length);
@@ -110,7 +110,7 @@ public HeapMemory setLongLE(int index, long value) {
110110
@Override
111111
public HeapMemory setBytes(int index, Memory src, int srcIndex, int length) {
112112
ensureAccessible();
113-
index = baseIndex + index;
113+
// index = baseIndex + index;
114114
checkSrcIndex(index, length, srcIndex, src.capacity());
115115
for (int i = 0; i < length; i++) {
116116
buffer.put(index++, src.getByte(srcIndex++));
@@ -121,7 +121,7 @@ public HeapMemory setBytes(int index, Memory src, int srcIndex, int length) {
121121
@Override
122122
public HeapMemory setBytes(int index, byte[] src, int srcIndex, int length) {
123123
ensureAccessible();
124-
index = baseIndex + index;
124+
// index = baseIndex + index;
125125
checkSrcIndex(index, length, srcIndex, src.length);
126126
byte[] bytesSrc = Arrays.copyOfRange(src, srcIndex, srcIndex + length);
127127
int pos = buffer.position();

gradle/configure.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ext {
77

88
NAME = 'common'
99
GROUP = 'com.ardikars.common'
10-
VERSION = '1.2.7.RC2'
10+
VERSION = '1.2.7.RC3'
1111
DESCRIPTION = 'Java Common is an project focused on all aspects of reusable Java components.'
1212

1313
MAVEN_LOCAL_REPOSITORY = "${rootDir}/build/repository"

0 commit comments

Comments
 (0)