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

8287541: Files.writeString fails to throw IOException for charset "windows-1252"

Browse source 
Reviewed-by: iris, bpb, alanb, jpai, lancea, aturbanov
This commit is contained in:
Naoto Sato 2022-06-08 15:50:06 +00:00
parent a9b9831f2a
commit 6fb84e2c91
2 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/java.base/share/classes/java/lang/String.java
View file

@ -845,7 +845,8 @@ public final class String
CharsetEncoder ce = cs.newEncoder(); CharsetEncoder ce = cs.newEncoder();
int len = val.length >> coder; // assume LATIN1=0/UTF16=1; int len = val.length >> coder; // assume LATIN1=0/UTF16=1;
int en = scale(len, ce.maxBytesPerChar()); int en = scale(len, ce.maxBytesPerChar());
if (ce instanceof ArrayEncoder ae) { // fastpath with ArrayEncoder implies `doReplace`.
if (doReplace && ce instanceof ArrayEncoder ae) {
// fastpath for ascii compatible // fastpath for ascii compatible
if (coder == LATIN1 && if (coder == LATIN1 &&
ae.isASCIICompatible() && ae.isASCIICompatible() &&
@ -856,10 +857,6 @@ public final class String
if (len == 0) { if (len == 0) {
return ba; return ba;
} }
if (doReplace) {
ce.onMalformedInput(CodingErrorAction.REPLACE)
.onUnmappableCharacter(CodingErrorAction.REPLACE);
}
int blen = (coder == LATIN1) ? ae.encodeFromLatin1(val, 0, len, ba) int blen = (coder == LATIN1) ? ae.encodeFromLatin1(val, 0, len, ba)
: ae.encodeFromUTF16(val, 0, len, ba); : ae.encodeFromUTF16(val, 0, len, ba);

22
test/jdk/java/nio/file/Files/ReadWriteString.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -46,11 +46,12 @@ import org.testng.annotations.DataProvider;
import org.testng.annotations.Test; import org.testng.annotations.Test;
/* @test /* @test
* @bug 8201276 8205058 8209576 * @bug 8201276 8205058 8209576 8287541
* @build ReadWriteString PassThroughFileSystem * @build ReadWriteString PassThroughFileSystem
* @run testng ReadWriteString * @run testng ReadWriteString
* @summary Unit test for methods for Files readString and write methods. * @summary Unit test for methods for Files readString and write methods.
* @key randomness * @key randomness
* @modules jdk.charsets
*/ */
@Test(groups = "readwrite") @Test(groups = "readwrite")
public class ReadWriteString { public class ReadWriteString {
@ -60,11 +61,6 @@ public class ReadWriteString {
final String TEXT_ASCII = "ABCDEFGHIJKLMNOPQRSTUVWXYZ\n abcdefghijklmnopqrstuvwxyz\n 1234567890\n"; final String TEXT_ASCII = "ABCDEFGHIJKLMNOPQRSTUVWXYZ\n abcdefghijklmnopqrstuvwxyz\n 1234567890\n";
private static final String JA_STRING = "\u65e5\u672c\u8a9e\u6587\u5b57\u5217"; private static final String JA_STRING = "\u65e5\u672c\u8a9e\u6587\u5b57\u5217";
// malformed input: a high surrogate without the low surrogate
static char[] illChars = {
'\u00fa', '\ud800'
};
static byte[] data = getData(); static byte[] data = getData();
static byte[] getData() { static byte[] getData() {
@ -98,6 +94,8 @@ public class ReadWriteString {
{path, "\u00A0\u00A1", US_ASCII}, {path, "\u00A0\u00A1", US_ASCII},
{path, "\ud800", UTF_8}, {path, "\ud800", UTF_8},
{path, JA_STRING, ISO_8859_1}, {path, JA_STRING, ISO_8859_1},
{path, "\u041e", Charset.forName("windows-1252")}, // cyrillic capital letter O
{path, "\u091c", Charset.forName("windows-31j")}, // devanagari letter ja
}; };
} }
@ -119,7 +117,7 @@ public class ReadWriteString {
* Writes the data using both the existing and new method and compares the results. * Writes the data using both the existing and new method and compares the results.
*/ */
@DataProvider(name = "testWriteString") @DataProvider(name = "testWriteString")
public Object[][] getWriteString() throws IOException { public Object[][] getWriteString() {
return new Object[][]{ return new Object[][]{
{testFiles[1], testFiles[2], TEXT_ASCII, US_ASCII, null}, {testFiles[1], testFiles[2], TEXT_ASCII, US_ASCII, null},
@ -134,8 +132,7 @@ public class ReadWriteString {
* Reads the file using both the existing and new method and compares the results. * Reads the file using both the existing and new method and compares the results.
*/ */
@DataProvider(name = "testReadString") @DataProvider(name = "testReadString")
public Object[][] getReadString() throws IOException { public Object[][] getReadString() {
Path path = Files.createTempFile("readString_file1", null);
return new Object[][]{ return new Object[][]{
{testFiles[1], TEXT_ASCII, US_ASCII, US_ASCII}, {testFiles[1], TEXT_ASCII, US_ASCII, US_ASCII},
{testFiles[1], TEXT_ASCII, US_ASCII, UTF_8}, {testFiles[1], TEXT_ASCII, US_ASCII, UTF_8},
@ -267,11 +264,10 @@ public class ReadWriteString {
path.toFile().deleteOnExit(); path.toFile().deleteOnExit();
String temp = new String(data, csWrite); String temp = new String(data, csWrite);
Files.writeString(path, temp, csWrite, CREATE); Files.writeString(path, temp, csWrite, CREATE);
String s;
if (csRead == null) { if (csRead == null) {
s = Files.readString(path); Files.readString(path);
} else { } else {
s = Files.readString(path, csRead); Files.readString(path, csRead);
} }
} }