-
Notifications
You must be signed in to change notification settings - Fork 517
8322215: [win] OS events that close the stage can cause Glass to reference freed memory #1309
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.
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
Conversation
👋 Welcome back mfox! A progress list of the required criteria for merging this PR into |
Webrevs
|
/reviewers 2 |
@kevinrushforth |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good! I've left a comment inline.
@@ -78,6 +84,10 @@ class BaseWnd { | |||
ATOM m_wndClassAtom; | |||
bool m_isCommonDialogOwner; | |||
HCURSOR m_hCursor; | |||
|
|||
LONG m_message_count; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Minor: the naming scheme in this class would be m_messageCount
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The code changes look good.
I tested it, and confirm that with a debug build the test crashes without the fix and passes with the fix.
@beldenfox 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:
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 26 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
/integrate |
Going to push as commit c1c52e5.
Your commit was automatically rebased without conflicts. |
@beldenfox Pushed as commit c1c52e5. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
/backport jfx jfx22 |
@beldenfox the backport was successfully created on the branch backport-beldenfox-c1c52e5a in my personal fork of openjdk/jfx. To create a pull request with this backport targeting openjdk/jfx:jfx22, just click the following link: The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:
If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jfx:
|
When a Stage is closed while processing an OS message the glass peer object is deleted immediately even if it's still executing member functions. As glass unwinds the stack and executes cleanup code it's referencing freed memory.
There are cases where glass generates JavaFX events back-to-back. For example, when handling the Delete key glass sends a PRESSED and TYPED event in the same routine. If the Stage is closed during the PRESSED event the code that sends the TYPED event is running inside an object that has already been deleted.
When the Stage is closed glass calls the OS routine ::DestroyWindow on the HWND causing a WM_NCDESTROY message to be sent. Currently the BaseWnd object is deleted when processing this message. This PR defers the destruction until all messages have been processed. This is the same approach used in the Linux code.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jfx.git pull/1309/head:pull/1309
$ git checkout pull/1309
Update a local copy of the PR:
$ git checkout pull/1309
$ git pull https://git.openjdk.org/jfx.git pull/1309/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 1309
View PR using the GUI difftool:
$ git pr show -t 1309
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jfx/pull/1309.diff
Webrev
Link to Webrev Comment