Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
8288589: Files.readString ignores encoding errors for UTF-16
Reviewed-by: rriggs, iris, alanb
- Loading branch information
Showing
4 changed files
with
163 additions
and
88 deletions.
There are no files selected for viewing
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
This file was deleted.
Oops, something went wrong.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
/* | ||
* 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 8288589 | ||
* @summary Tests for *NoRepl() shared secret methods. | ||
* @run testng NoReplTest | ||
* @modules jdk.charsets | ||
*/ | ||
|
||
import java.io.IOException; | ||
import java.nio.charset.CharacterCodingException; | ||
import java.nio.charset.Charset; | ||
import java.nio.file.Files; | ||
import java.util.HexFormat; | ||
import static java.nio.charset.StandardCharsets.UTF_16; | ||
|
||
import org.testng.annotations.Test; | ||
|
||
@Test | ||
public class NoReplTest { | ||
private final static byte[] MALFORMED_UTF16 = {(byte)0x00, (byte)0x20, (byte)0x00}; | ||
private final static String MALFORMED_WINDOWS_1252 = "\u0080\u041e"; | ||
private final static Charset WINDOWS_1252 = Charset.forName("windows-1252"); | ||
|
||
/** | ||
* Verifies newStringNoRepl() throws a CharacterCodingException. | ||
* The method is invoked by `Files.readString()` method. | ||
*/ | ||
@Test | ||
public void newStringNoReplTest() throws IOException { | ||
var f = Files.createTempFile(null, null); | ||
try (var fos = Files.newOutputStream(f)) { | ||
fos.write(MALFORMED_UTF16); | ||
var read = Files.readString(f, UTF_16); | ||
throw new RuntimeException("Exception should be thrown for a malformed input. Bytes read: " + | ||
HexFormat.of() | ||
.withPrefix("x") | ||
.withUpperCase() | ||
.formatHex(read.getBytes(UTF_16))); | ||
} catch (CharacterCodingException cce) { | ||
// success | ||
} finally { | ||
Files.delete(f); | ||
} | ||
} | ||
|
||
/** | ||
* Verifies getBytesNoRepl() throws a CharacterCodingException. | ||
* The method is invoked by `Files.writeString()` method. | ||
*/ | ||
@Test | ||
public void getBytesNoReplTest() throws IOException { | ||
var f = Files.createTempFile(null, null); | ||
try { | ||
Files.writeString(f, MALFORMED_WINDOWS_1252, WINDOWS_1252); | ||
throw new RuntimeException("Exception should be thrown"); | ||
} catch (CharacterCodingException cce) { | ||
// success | ||
} finally { | ||
Files.delete(f); | ||
} | ||
} | ||
} |
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
2728770
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review
Issues
2728770
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/backport jdk19
2728770
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@naotoj the backport was successfully created on the branch naotoj-backport-2728770e in my personal fork of openjdk/jdk19. To create a pull request with this backport targeting openjdk/jdk19:master, just click the following link:
➡️ Create pull request
The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:
If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk19:
2728770
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/backport jdk17u-dev
2728770
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@GoeLin the backport was successfully created on the branch GoeLin-backport-2728770e in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:
➡️ Create pull request
The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:
If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev: