Skip to content

Ensure read/write indices of input buffers are not modified #509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 2, 2018
Merged

Ensure read/write indices of input buffers are not modified #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions rsocket-core/src/main/java/io/rsocket/frame/FrameHeaderFlyweight.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public static int encodeMetadata(
encodeLength(byteBuf, metadataOffset, metadataLength);
length += FRAME_LENGTH_SIZE;
}
byteBuf.setBytes(metadataOffset + length, metadata);
byteBuf.setBytes(metadataOffset + length, metadata, metadata.readerIndex(), metadataLength);
length += metadataLength;
}

Expand All @@ -127,7 +127,7 @@ public static int encodeData(final ByteBuf byteBuf, final int dataOffset, final
final int dataLength = data.readableBytes();

if (0 < dataLength) {
byteBuf.setBytes(dataOffset, data);
byteBuf.setBytes(dataOffset, data, data.readerIndex(), dataLength);
length += dataLength;
}

Expand Down
2 changes: 1 addition & 1 deletion rsocket-core/src/main/java/io/rsocket/frame/SetupFrameFlyweight.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ static int encode(
byteBuf.setShort(length, resumeToken.readableBytes());
length += Short.BYTES;
int resumeTokenLength = resumeToken.readableBytes();
byteBuf.setBytes(length, resumeToken, resumeTokenLength);
byteBuf.setBytes(length, resumeToken, resumeToken.readerIndex(), resumeTokenLength);
length += resumeTokenLength;
}

Expand Down
4 changes: 2 additions & 2 deletions rsocket-core/src/main/java/io/rsocket/util/ByteBufPayload.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ public boolean hasMetadata() {

@Override
public ByteBuf sliceMetadata() {
return metadata == null ? Unpooled.EMPTY_BUFFER : metadata;
return metadata == null ? Unpooled.EMPTY_BUFFER : metadata.slice();
}

@Override
public ByteBuf sliceData() {
return data;
return data.slice();
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions rsocket-core/src/main/java/io/rsocket/util/DefaultPayload.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ public ByteBuf sliceData() {

@Override
public ByteBuffer getMetadata() {
return metadata == null ? DefaultPayload.EMPTY_BUFFER : metadata;
return metadata == null ? DefaultPayload.EMPTY_BUFFER : metadata.duplicate();
}

@Override
public ByteBuffer getData() {
return data;
return data.duplicate();
}

@Override
Expand Down