archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8297632: InputStream.transferTo() method should specify what the return value should be when the number of bytes transfered is larger than Long.MAX_VALUE

Browse source 
Reviewed-by: alanb, lancea
This commit is contained in:
Brian Burkhalter 2023-02-14 16:30:52 +00:00
parent f7dee77d73
commit 5b2d430131
7 changed files with 52 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/java.base/share/classes/java/io/Reader.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -421,6 +421,9 @@ public abstract class Reader implements Readable, Closeable {
* interrupted during the transfer, is highly reader and writer
* specific, and therefore not specified.
* <p>
* If the total number of characters transferred is greater than {@linkplain
* Long#MAX_VALUE}, then {@code Long.MAX_VALUE} will be returned.
* <p>
* If an I/O error occurs reading from the reader or writing to the
* writer, then it may do so after some characters have been read or
* written. Consequently the reader may not be at end of the stream and
@ -441,7 +444,13 @@ public abstract class Reader implements Readable, Closeable {
int nRead;
while ((nRead = read(buffer, 0, TRANSFER_BUFFER_SIZE)) >= 0) {
out.write(buffer, 0, nRead);
transferred += nRead;
if (transferred < Long.MAX_VALUE) {
try {
transferred = Math.addExact(transferred, nRead);
} catch (ArithmeticException ignore) {
transferred = Long.MAX_VALUE;
}
}
}
return transferred;
}