protocols: Fix IWaylandProtocol onDisplayDestroy m_pGlobal double-free #9507
+6
−2
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.
Describe your PR, what does it fix/add?
This fixes a segfault on Hyprland shutdown caused by the wl_global_destroy call modified in this PR:
Looking at the code, m_pGlobal will be destroyed first when the display is destroyed by the onDisplayDestroy hook, and then a second time when the wayland protocol is destroyed (if that happens later) by the IWaylandProtocol destructor calling onDisplayDestroy a second time. This PR fixes that by setting m_pGlobal to nullptr after destroying it and adding null checks.
Is there anything you want to mention? (unchecked code, possible bugs, found problems, breaking compatibility, etc.)
I don't think the m_pGlobal null check in removeGlobal is necessary, but better safe than sorry I figure.
The
m_liDisplayDestroy.listener.link
removal is fine as-is because it's already re-init'ed afterwards in the existing code, meaning that the second removal will be a no-op.Is it ready for merging, or does it need work?
Ready for merging