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.

Sign up for GitHub

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

Jump to bottom

8313865: Always true condition in sun.nio.cs.CharsetMapping#readINDEXC2B #15672

Closed
wants to merge 1 commit into from
Closed

8313865: Always true condition in sun.nio.cs.CharsetMapping#readINDEXC2B #15672

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 2 additions & 7 deletions src/java.base/share/classes/sun/nio/cs/CharsetMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 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
Expand All @@ -26,12 +26,7 @@
package sun.nio.cs;

import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.BufferedReader;
import java.io.IOException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.*;
import java.security.*;

Expand Down Expand Up @@ -244,7 +239,7 @@ void readSINGLEBYTE() {
void readINDEXC2B() {
char[] map = readCharArray();
for (int i = map.length - 1; i >= 0; i--) {
if (c2b == null && map[i] != -1) {
if (c2b == null) {
Copy link
Member

Choose a reason for hiding this comment

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

Post-review comment:

I don't quite understand this code. c2b is loop-invariant, right? So, what this does is checking for c2b != null, and if so, instantiates the c2b array with new char[map[map.length - 1] + 256]. This does not even require a loop, as written right now.

Copy link
Member Author

Choose a reason for hiding this comment

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

Indeed the code looks weird. Will have a deeper look. Thanks!

Copy link
Member Author

Choose a reason for hiding this comment

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

The code seems to read the data written with this piece of code:

jdk/make/jdk/src/classes/build/tools/charsetmapping/JIS0213.java

Line 145 in b55e418

private static void writeINDEXC2B(OutputStream out, int[] indexC2B)

but apparently it does not seem to work as expected. Since this is a very old code, not sure I would proactively modify it though.

c2b = new char[map[i] + 256];
Arrays.fill(c2b, (char)UNMAPPABLE_ENCODING);
break;
Expand Down