Skip to content
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

Jump to bottom

Add tests that CodedOutputStream.spaceLeft isn't negative after overflow. #18446

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+277 −218
Draft

Add tests that CodedOutputStream.spaceLeft isn't negative after overflow. #18446

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
16 changes: 14 additions & 2 deletions java/core/src/main/java/com/google/protobuf/CodedOutputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1306,12 +1306,14 @@ final void writeMessageNoTag(final MessageLite value, Schema schema) throws IOEx

@Override
public final void write(byte value) throws IOException {
int position = this.position;
try {
buffer[position++] = value;
} catch (IndexOutOfBoundsException e) {
throw new OutOfSpaceException(
String.format("Pos: %d, limit: %d, len: %d", position, limit, 1), e);
}
this.position = position; // Only update position if we stayed within the array bounds.
}

@Override
Expand Down Expand Up @@ -2042,7 +2044,12 @@ public void writeUInt32NoTag(int value) throws IOException {

@Override
public void writeFixed32NoTag(int value) throws IOException {
buffer.putInt(bufferPos(position), value);
try {
buffer.putInt(bufferPos(position), value);
} catch (IndexOutOfBoundsException e) {
throw new OutOfSpaceException(
String.format("Pos: %d, limit: %d, len: %d", position, limit, 4), e);
}
position += FIXED32_SIZE;
}

Expand Down Expand Up @@ -2076,7 +2083,12 @@ public void writeUInt64NoTag(long value) throws IOException {

@Override
public void writeFixed64NoTag(long value) throws IOException {
buffer.putLong(bufferPos(position), value);
try {
buffer.putLong(bufferPos(position), value);
} catch (IndexOutOfBoundsException e) {
throw new OutOfSpaceException(
String.format("Pos: %d, limit: %d, len: %d", position, limit, 4), e);
}
position += FIXED64_SIZE;
}

Expand Down
Loading
Loading