[release/3.1] Port ToolTip reentrancy fix from 4.8 #5013
Merged
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.
Addresses #3112
This is a port of a servicing fix in .NET 4.7-4.8
Issue: Closing a ToolTip raises events to user code that can request the ToolTip to close. The re-entrancy can lead to a NullReferenceException.
Discussion:
PopupControlService.RaiseToolTipClosingEvent should check _currentToolTip for null after doing anything that can call out to user code, to guard against re-entrant calls.