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

8240725: Some functions might not work with CJK character

Browse source 
Reviewed-by: naoto
This commit is contained in:
Yasumasa Suenaga 2020-03-11 13:14:40 +09:00
parent 80ca356e7e
commit 99b28daf56
4 changed files with 72 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/java.base/windows/native/libjava/canonicalize_md.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2020, 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
@ -330,15 +330,22 @@ JNIEXPORT int
JDK_Canonicalize(const char *orig, char *out, int len) {
wchar_t* wpath = NULL;
wchar_t* wresult = NULL;
size_t conv;
size_t path_len = strlen(orig);
int wpath_len;
int ret = -1;
if ((wpath = (wchar_t*) malloc(sizeof(wchar_t) * (path_len + 1))) == NULL) {
/* Get required buffer size to convert to Unicode */
wpath_len = MultiByteToWideChar(CP_THREAD_ACP, MB_ERR_INVALID_CHARS,
orig, -1, NULL, 0);
if (wpath_len == 0) {
goto finish;
}
if (mbstowcs_s(&conv, wpath, path_len + 1, orig, path_len) != 0) {
if ((wpath = (wchar_t*) malloc(sizeof(wchar_t) * wpath_len)) == NULL) {
goto finish;
}
if (MultiByteToWideChar(CP_THREAD_ACP, MB_ERR_INVALID_CHARS,
orig, -1, wpath, wpath_len) == 0) {
goto finish;
}
@ -350,7 +357,8 @@ JDK_Canonicalize(const char *orig, char *out, int len) {
goto finish;
}
if (wcstombs_s(&conv, out, (size_t) len, wresult, (size_t) (len - 1)) != 0) {
if (WideCharToMultiByte(CP_THREAD_ACP, 0,
wresult, -1, out, len, NULL, NULL) == 0) {
goto finish;
}