Use GetTempPath2 API instead of GetTempPath #21
Closed
Conversation
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
|
I recommend adding a sentence in the PR description acknowledging there is code duplication and the reasoning |
JohnTortugo
reviewed
Aug 15, 2024
| @@ -1515,12 +1519,16 @@ int os::closedir(DIR *dirp) { | |||
| // directory not the java application's temp directory, ala java.io.tmpdir. | |||
| const char* os::get_temp_directory() { | |||
| static char path_buf[MAX_PATH]; | |||
| if (GetTempPath(MAX_PATH, path_buf) > 0) { | |||
| if (_GetTempPath2A != nullptr) { | |||
| if (_GetTempPath2A(MAX_PATH, path_buf) > 0) { | |||
| return path_buf; | |||
There was a problem hiding this comment.
Looks like the code indentation here is not correct. Is it?
| path_buf[0] = '\0'; | ||
| } | ||
| } | ||
| else if (GetTempPath(MAX_PATH, path_buf) > 0) { |
| @@ -321,6 +321,26 @@ SetupI18nProps(LCID lcid, char** language, char** script, char** country, | |||
| return TRUE; | |||
| } | |||
|
|
|||
| // For dynamic lookup of GetTempPath2 API | |||
| typedef DWORD (WINAPI *GetTempPath2WFnPtr)(DWORD, LPWSTR); | |||
| static GetTempPath2WFnPtr _GetTempPath2W = NULL; | |||
There was a problem hiding this comment.
I think the code should use "nullptr" instead of NULL? I'm OK with it being "NULL" if other places in the file also uses NULL.
There was a problem hiding this comment.
Why all these leading "_" ? Is that a coding guideline for that?
There was a problem hiding this comment.
Using NULL as it is C code and others are C++.
|
Created an upstream PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://bugs.openjdk.org/browse/JDK-8337408
Use the
GetTempPath2APIs instead of theGetTempPathAPIs in native code across the OpenJDK repository to retrieve the temporary directory path, asGetTempPath2provides enhanced security. WhileGetTempPathmay still function without errors, usingGetTempPath2reduces the risk of potential exploits for users.The code is duplicated, and we cannot address this issue for the following reasons: