Skip to content

chore: set bufferSize to 1 when bufferSize is less than or equal to 0 is in BoundedStreamBufferer #283

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
kessplas merged 1 commit into from
May 29, 2024
Merged

chore: set bufferSize to 1 when bufferSize is less than or equal to 0 is in BoundedStreamBufferer #283

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
10 changes: 10 additions & 0 deletions src/test/java/software/amazon/encryption/s3/utils/BoundedStreamBufferer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
public class BoundedStreamBufferer {

public static byte[] toByteArray(InputStream is, int bufferSize) throws IOException {
if (bufferSize <= 0) {
// buffer size cannot be zero,
// set it to 1 instead.
bufferSize = 1;
}
try (ByteArrayOutputStream output = new ByteArrayOutputStream()) {
byte[] b = new byte[bufferSize];
int n;
Expand All @@ -23,6 +28,11 @@ public static byte[] toByteArray(InputStream is, int bufferSize) throws IOExcept
}

public static byte[] toByteArrayWithMarkReset(InputStream is, int bufferSize) throws IOException {
if (bufferSize <= 0) {
// buffer size cannot be zero,
// set it to 1 instead.
bufferSize = 1;
}
try (ByteArrayOutputStream output = new ByteArrayOutputStream()) {
byte[] b = new byte[bufferSize];
// burn some bytes to force mark/reset
Expand Down