Skip to content

Conversation

@lukostyra
Copy link
Contributor

@lukostyra lukostyra commented Jul 8, 2024

When GetSystemDirectory does not have enough space to output a path to Windows' system directory, it will return a different value than 0 (more notably, the amount of bytes actually needed including null terminator). This was not checked, so the very rare hypothetical situation where Windows' system directory is different than the "standard" C:\Windows and longer than MAX_PATH was not properly handled.

For now I simply changed the code to print an error and exit. This could be improved further to instead dynamically allocate space for the system directory though.

Other changes, also mentioned in the issue:

  • We use wchar_t explicitly here, so I changed GetSystemDirectory to GetSystemDirectoryW to ensure the code compiles even without UNICODE being defined
  • wcscat_s can potentially fail for the same reasons as above, so this situation is also handled now.

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (2 reviews required, with at least 1 Reviewer, 1 Author)

Issue

  • JDK-8335216: [windows] Missing error check for GetSystemDirectory in glass (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jfx.git pull/1498/head:pull/1498
$ git checkout pull/1498

Update a local copy of the PR:
$ git checkout pull/1498
$ git pull https://git.openjdk.org/jfx.git pull/1498/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1498

View PR using the GUI difftool:
$ git pr show -t 1498

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jfx/pull/1498.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 8, 2024

👋 Welcome back lkostyra! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Jul 8, 2024

@lukostyra This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8335216: [windows] Missing error check for GetSystemDirectory in glass

Reviewed-by: mstrauss, kcr

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the rfr Ready for review label Jul 8, 2024
@mlbridge
Copy link

mlbridge bot commented Jul 8, 2024

Webrevs

@kevinrushforth kevinrushforth self-requested a review July 8, 2024 17:53
@kevinrushforth
Copy link
Member

I'll review this.

@mstr2 Would you like to be the second reviewer?

/reviewers 2

@openjdk
Copy link

openjdk bot commented Jul 8, 2024

@kevinrushforth
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 2 (with at least 1 Reviewer, 1 Author).

Copy link
Collaborator

@mstr2 mstr2 left a comment

Choose a reason for hiding this comment

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

I've checked the specification of GetSystemDirectoryW and wcscat_s. The patch will correctly catch failure cases.

Copy link
Member

@kevinrushforth kevinrushforth left a comment

Choose a reason for hiding this comment

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

Looks good. I ran a quick sanity test as well.

@openjdk openjdk bot added the ready Ready to be integrated label Jul 8, 2024
@lukostyra
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Jul 9, 2024

Going to push as commit 56e07db.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jul 9, 2024
@openjdk openjdk bot closed this Jul 9, 2024
@openjdk openjdk bot removed ready Ready to be integrated rfr Ready for review labels Jul 9, 2024
@openjdk
Copy link

openjdk bot commented Jul 9, 2024

@lukostyra Pushed as commit 56e07db.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@lukostyra lukostyra deleted the roactivation_missing_checks-8335216 branch December 10, 2024 10:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants