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.

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

8322877: java/io/BufferedInputStream/TransferTo.java failed with IndexOutOfBoundsException #17250

Closed
wants to merge 1 commit into from

Conversation

bplb
Copy link
Member

@bplb bplb commented Jan 3, 2024

The final position instead of the number of bytes to write was being passed to ByteArrayOuputStream.write(byte[],int,int).


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8322877: java/io/BufferedInputStream/TransferTo.java failed with IndexOutOfBoundsException (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/17250/head:pull/17250
$ git checkout pull/17250

Update a local copy of the PR:
$ git checkout pull/17250
$ git pull https://git.openjdk.org/jdk.git pull/17250/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17250

View PR using the GUI difftool:
$ git pr show -t 17250

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/17250.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 3, 2024

👋 Welcome back bpb! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@bplb
Copy link
Member Author

bplb commented Jan 3, 2024

Everyone was apparently caught off guard as previously Arrays.copyOfRange(byte[],int,int) had been used here, and its third parameter is the to position, not the number of bytes to copy.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 3, 2024
@openjdk
Copy link

openjdk bot commented Jan 3, 2024

@bplb The following label will be automatically applied to this pull request:

  • core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Jan 3, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 3, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Jan 3, 2024

@bplb This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8322877: java/io/BufferedInputStream/TransferTo.java failed with IndexOutOfBoundsException

Reviewed-by: alanb, stsypanov

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 1 new commit pushed to the master branch:

  • 296c5b6: 8322873: Duplicate -ljava -ljvm options for libinstrument

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 3, 2024
@bplb
Copy link
Member Author

bplb commented Jan 3, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Jan 3, 2024

Going to push as commit 54b3cee.
Since your change was applied there have been 3 commits pushed to the master branch:

  • 30a0c61: 8322879: Eliminate -Wparentheses warnings in x86-32 code
  • 409a39e: 8320276: Improve class initialization barrier in TemplateTable::_new
  • 296c5b6: 8322873: Duplicate -ljava -ljvm options for libinstrument

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jan 3, 2024
@openjdk openjdk bot closed this Jan 3, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 3, 2024
@openjdk
Copy link

openjdk bot commented Jan 3, 2024

@bplb Pushed as commit 54b3cee.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@bplb bplb deleted the BIS-transferTo-IOOBE-8322877 branch January 3, 2024 21:24
@@ -644,7 +644,7 @@ private long implTransferTo(OutputStream out) throws IOException {
int avail = count - pos;
if (avail > 0) {
if (isTrusted(out)) {
out.write(getBufIfOpen(), pos, count);
out.write(getBufIfOpen(), pos, avail);
} else {
// Prevent poisoning and leaking of buf
byte[] buffer = Arrays.copyOfRange(getBufIfOpen(), pos, count);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bplb Shouldn't it be avail here, too?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No: the third param of Arrays.copyOfRange is to, not len.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, this explains why it did not fail originally, but only after adding the "isTrusted" case! 🙏

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See #17250 (comment) above.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants