stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8286287: Reading file as UTF-16 causes Error which "shouldn't happen"

Browse Source 
Reviewed-by: jpai, bpb, rriggs
This commit is contained in:
Naoto Sato 2022-05-12 15:58:19 +00:00
parent 82aa045584
commit cc7560e995
2 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java.base/share/classes/java/lang/String.java
View File

@ -658,8 +658,6 @@ public final class String
// decode using CharsetDecoder // decode using CharsetDecoder
int en = scale(length, cd.maxCharsPerByte()); int en = scale(length, cd.maxCharsPerByte());
cd.onMalformedInput(CodingErrorAction.REPLACE)
.onUnmappableCharacter(CodingErrorAction.REPLACE);
char[] ca = new char[en]; char[] ca = new char[en];
if (charset.getClass().getClassLoader0() != null && if (charset.getClass().getClassLoader0() != null &&
System.getSecurityManager() != null) { System.getSecurityManager() != null) {
@ -1207,6 +1205,8 @@ public final class String
private static int decodeWithDecoder(CharsetDecoder cd, char[] dst, byte[] src, int offset, int length) { private static int decodeWithDecoder(CharsetDecoder cd, char[] dst, byte[] src, int offset, int length) {
ByteBuffer bb = ByteBuffer.wrap(src, offset, length); ByteBuffer bb = ByteBuffer.wrap(src, offset, length);
CharBuffer cb = CharBuffer.wrap(dst, 0, dst.length); CharBuffer cb = CharBuffer.wrap(dst, 0, dst.length);
cd.onMalformedInput(CodingErrorAction.REPLACE)
.onUnmappableCharacter(CodingErrorAction.REPLACE);
try { try {
CoderResult cr = cd.decode(bb, cb, true); CoderResult cr = cd.decode(bb, cb, true);
if (!cr.isUnderflow()) if (!cr.isUnderflow())

50
test/jdk/java/lang/String/NewStringNoRepl.java Normal file
View File

@ -0,0 +1,50 @@
/*
* Copyright (c) 2022, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8286287
* @summary Verifies newStringNoRepl() does not throw an Error.
*/
import java.io.IOException;
import java.nio.file.Files;
import java.util.HexFormat;
import static java.nio.charset.StandardCharsets.UTF_16;
public class NewStringNoRepl {
private final static byte[] MALFORMED_UTF16 = {(byte)0x00, (byte)0x20, (byte)0x00};
public static void main(String... args) throws IOException {
var f = Files.createTempFile(null, null);
try (var fos = Files.newOutputStream(f)) {
fos.write(MALFORMED_UTF16);
}
System.out.println("Returned bytes: " +
HexFormat.of()
.withPrefix("x")
.withUpperCase()
.formatHex(Files.readString(f, UTF_16).getBytes(UTF_16)));
Files.delete(f);
}
}