Fix bug in SlicedInputStream with zero length #4863
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
andrross
force-pushed
the
sliced-input-stream-bug
branch
from
38d0ade to
6156df1
Compare
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
kotwanikunal
approved these changes
Oct 21, 2022
|
Rebase? I think CI is fixed. |
andrross
force-pushed
the
sliced-input-stream-bug
branch
from
6156df1 to
2ecfc8a
Compare
Spotless error. Rookie mistake :) Should be fixed now. |
Gradle Check (Jenkins) Run Completed with:
|
adnapibar
reviewed
Oct 21, 2022
| @@ -100,6 +101,11 @@ public final int read() throws IOException { | |||
|
|
|||
| @Override | |||
| public final int read(byte[] buffer, int offset, int length) throws IOException { | |||
| Objects.checkFromIndexSize(offset, length, buffer.length); | |||
| if (length == 0) { | |||
There was a problem hiding this comment.
Objects.checkFromIndexSize handles the invalid cases, so less than zero will never get here.
adnapibar
approved these changes
Oct 21, 2022
Per the contract of InputStream#read(byte[], int, int):
If len is zero, then no bytes are read and 0 is returned
SlicedInputStream had a bug where if a zero length was passed then it
would drain all the underlying streams and return -1. This was uncovered
by using InputStream#readAllBytes in new code under development. The
only existing usage of SlicedInputStream should not be vulnerable to this
bug.
I've also added a check for invalid arguments and created tests to
ensure the proper exceptions are thrown per the InputStream contract. In
the test I've replaced a "readFully" method with an equivalent
"readNBytes" that was introduced in Java 11.
Signed-off-by: Andrew Ross <andrross@amazon.com>
andrross
force-pushed
the
sliced-input-stream-bug
branch
from
2ecfc8a to
a1cf4c0
Compare
reta
approved these changes
Oct 22, 2022
Gradle Check (Jenkins) Run Completed with:
|
|
Test failure: #4881 |
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
Codecov Report
@@ Coverage Diff @@
## main #4863 +/- ##
============================================
- Coverage 71.79% 70.79% -1.01%
+ Complexity 62907 57861 -5046
============================================
Files 4689 4689
Lines 300505 276913 -23592
Branches 46129 40301 -5828
============================================
- Hits 215750 196033 -19717
+ Misses 67829 64681 -3148
+ Partials 16926 16199 -727
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
andrross
added
backport 2.x
This was referenced Nov 2, 2022
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Nov 2, 2022
Per the contract of InputStream#read(byte[], int, int):
If len is zero, then no bytes are read and 0 is returned
SlicedInputStream had a bug where if a zero length was passed then it
would drain all the underlying streams and return -1. This was uncovered
by using InputStream#readAllBytes in new code under development. The
only existing usage of SlicedInputStream should not be vulnerable to this
bug.
I've also added a check for invalid arguments and created tests to
ensure the proper exceptions are thrown per the InputStream contract. In
the test I've replaced a "readFully" method with an equivalent
"readNBytes" that was introduced in Java 11.
Signed-off-by: Andrew Ross <andrross@amazon.com>
Signed-off-by: Andrew Ross <andrross@amazon.com>
(cherry picked from commit 6571db7)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
# Conflicts:
# CHANGELOG.md
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Nov 2, 2022
Per the contract of InputStream#read(byte[], int, int):
If len is zero, then no bytes are read and 0 is returned
SlicedInputStream had a bug where if a zero length was passed then it
would drain all the underlying streams and return -1. This was uncovered
by using InputStream#readAllBytes in new code under development. The
only existing usage of SlicedInputStream should not be vulnerable to this
bug.
I've also added a check for invalid arguments and created tests to
ensure the proper exceptions are thrown per the InputStream contract. In
the test I've replaced a "readFully" method with an equivalent
"readNBytes" that was introduced in Java 11.
Signed-off-by: Andrew Ross <andrross@amazon.com>
Signed-off-by: Andrew Ross <andrross@amazon.com>
(cherry picked from commit 6571db7)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
# Conflicts:
# CHANGELOG.md
andrross
pushed a commit
that referenced
this pull request
Nov 2, 2022
Per the contract of InputStream#read(byte[], int, int):
If len is zero, then no bytes are read and 0 is returned
SlicedInputStream had a bug where if a zero length was passed then it
would drain all the underlying streams and return -1. This was uncovered
by using InputStream#readAllBytes in new code under development. The
only existing usage of SlicedInputStream should not be vulnerable to this
bug.
I've also added a check for invalid arguments and created tests to
ensure the proper exceptions are thrown per the InputStream contract. In
the test I've replaced a "readFully" method with an equivalent
"readNBytes" that was introduced in Java 11.
Signed-off-by: Andrew Ross <andrross@amazon.com>
Signed-off-by: Andrew Ross <andrross@amazon.com>
(cherry picked from commit 6571db7)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Andrew Ross <andrross@amazon.com>
andrross
pushed a commit
that referenced
this pull request
Nov 2, 2022
Per the contract of InputStream#read(byte[], int, int):
If len is zero, then no bytes are read and 0 is returned
SlicedInputStream had a bug where if a zero length was passed then it
would drain all the underlying streams and return -1. This was uncovered
by using InputStream#readAllBytes in new code under development. The
only existing usage of SlicedInputStream should not be vulnerable to this
bug.
I've also added a check for invalid arguments and created tests to
ensure the proper exceptions are thrown per the InputStream contract. In
the test I've replaced a "readFully" method with an equivalent
"readNBytes" that was introduced in Java 11.
Signed-off-by: Andrew Ross <andrross@amazon.com>
Signed-off-by: Andrew Ross <andrross@amazon.com>
(cherry picked from commit 6571db7)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Andrew Ross <andrross@amazon.com>
andrross
pushed a commit
that referenced
this pull request
Nov 2, 2022
Per the contract of InputStream#read(byte[], int, int):
If len is zero, then no bytes are read and 0 is returned
SlicedInputStream had a bug where if a zero length was passed then it
would drain all the underlying streams and return -1. This was uncovered
by using InputStream#readAllBytes in new code under development. The
only existing usage of SlicedInputStream should not be vulnerable to this
bug.
I've also added a check for invalid arguments and created tests to
ensure the proper exceptions are thrown per the InputStream contract. In
the test I've replaced a "readFully" method with an equivalent
"readNBytes" that was introduced in Java 11.
Signed-off-by: Andrew Ross <andrross@amazon.com>
(cherry picked from commit 6571db7)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Andrew Ross <andrross@amazon.com>
andrross
pushed a commit
that referenced
this pull request
Nov 2, 2022
Per the contract of InputStream#read(byte[], int, int):
If len is zero, then no bytes are read and 0 is returned
SlicedInputStream had a bug where if a zero length was passed then it
would drain all the underlying streams and return -1. This was uncovered
by using InputStream#readAllBytes in new code under development. The
only existing usage of SlicedInputStream should not be vulnerable to this
bug.
I've also added a check for invalid arguments and created tests to
ensure the proper exceptions are thrown per the InputStream contract. In
the test I've replaced a "readFully" method with an equivalent
"readNBytes" that was introduced in Java 11.
Signed-off-by: Andrew Ross <andrross@amazon.com>
(cherry picked from commit 6571db7)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Andrew Ross <andrross@amazon.com>
tlfeng
pushed a commit
to tlfeng/OpenSearch
that referenced
this pull request
Nov 3, 2022
ashking94
pushed a commit
to ashking94/OpenSearch
that referenced
this pull request
Nov 7, 2022
Per the contract of InputStream#read(byte[], int, int):
If len is zero, then no bytes are read and 0 is returned
SlicedInputStream had a bug where if a zero length was passed then it
would drain all the underlying streams and return -1. This was uncovered
by using InputStream#readAllBytes in new code under development. The
only existing usage of SlicedInputStream should not be vulnerable to this
bug.
I've also added a check for invalid arguments and created tests to
ensure the proper exceptions are thrown per the InputStream contract. In
the test I've replaced a "readFully" method with an equivalent
"readNBytes" that was introduced in Java 11.
Signed-off-by: Andrew Ross <andrross@amazon.com>
Signed-off-by: Andrew Ross <andrross@amazon.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Per the contract of InputStream#read(byte[], int, int):
SlicedInputStream had a bug where if a zero length was passed then it would drain all the underlying streams and return -1. This was uncovered by using InputStream#readAllBytes in new code under development. The only existing usage of SlicedInputStream should not be vulnerable to this bug.
I've also added a check for invalid arguments and created tests to ensure the proper exceptions are thrown per the InputStream contract. In the test I've replaced a "readFully" method with an equivalent "readNBytes" that was introduced in Java 11.
Signed-off-by: Andrew Ross andrross@amazon.com
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.