stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8292866: Java_sun_awt_shell_Win32ShellFolder2_getLinkLocation check MultiByteToWideChar return value for failures

Browse Source 
Reviewed-by: mdoerr, stuefe
This commit is contained in:
Matthias Baesken 2022-09-12 06:41:48 +00:00
parent 68da02c7b5
commit 699c42962e
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 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
@ -700,6 +700,7 @@ JNIEXPORT jlong JNICALL Java_sun_awt_shell_Win32ShellFolder2_getLinkLocation
STRRET strret; STRRET strret;
OLECHAR olePath[MAX_PATH]; // wide-char version of path name OLECHAR olePath[MAX_PATH]; // wide-char version of path name
LPWSTR wstr; LPWSTR wstr;
int ret;
IShellFolder* pParent = (IShellFolder*)parentIShellFolder; IShellFolder* pParent = (IShellFolder*)parentIShellFolder;
if (pParent == NULL) { if (pParent == NULL) {
@ -719,12 +720,18 @@ JNIEXPORT jlong JNICALL Java_sun_awt_shell_Win32ShellFolder2_getLinkLocation
switch (strret.uType) { switch (strret.uType) {
case STRRET_CSTR : case STRRET_CSTR :
// IShellFolder::ParseDisplayName requires the path name in Unicode. // IShellFolder::ParseDisplayName requires the path name in Unicode.
MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, strret.cStr, -1, olePath, MAX_PATH); ret = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, strret.cStr, -1, olePath, MAX_PATH);
if (ret == 0) {
return NULL;
}
wstr = olePath; wstr = olePath;
break; break;
case STRRET_OFFSET : case STRRET_OFFSET :
MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, (CHAR *)pidl + strret.uOffset, -1, olePath, MAX_PATH); ret = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, (CHAR *)pidl + strret.uOffset, -1, olePath, MAX_PATH);
if (ret == 0) {
return NULL;
}
wstr = olePath; wstr = olePath;
break; break;