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

8272352: Java launcher can not parse Chinese character when system locale is set to UTF-8 #8434

Closed
wants to merge 2 commits into from
+12 −10
Closed

8272352: Java launcher can not parse Chinese character when system locale is set to UTF-8 #8434

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cde671c
8272352: Java launcher can not parse Chinese character when system lo…
naotoj Apr 27, 2022
e04e0fb
Default to UTF-8 if malloc fails
naotoj May 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/java.base/windows/native/libjava/java_props_md.c
View file
Original file line number Diff line number Diff line change
@@ -693,6 +693,9 @@ GetJavaProperties(JNIEnv* env)
&display_encoding);

sprops.sun_jnu_encoding = getEncodingInternal(0);
Copy link
Contributor

Choose a reason for hiding this comment

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

How should NULL from getEncodingInternal be handled? (only if malloc fails).
Perhaps just it should return the literal "UTF-8".

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed as suggested.

Copy link
Contributor

Choose a reason for hiding this comment

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

How should NULL from getEncodingInternal be handled? (only if malloc fails).

Copy link
Contributor

Choose a reason for hiding this comment

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

Ignore the repeated comment. The code looks fine.

if (sprops.sun_jnu_encoding == NULL) {
sprops.sun_jnu_encoding = "UTF-8";
}
if (LANGIDFROMLCID(userDefaultLCID) == 0x0c04 && majorVersion == 6) {
// MS claims "Vista has built-in support for HKSCS-2004.
// All of the HKSCS-2004 characters have Unicode 4.1.