Fix potential hang after restoring keyframe due to invalid blocklist pointers. #503
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
…pointers. When restoring a keyframe, the blockmap is not cleared and blocklist pointers are modified during P_UnArchiveThinkers. The blockmap is then restored in UnArchiveBlockLinks, but this can leave blocklist pointers in an invalid state. This can then lead to a hang later when the blocklist is iterated and may get stuck in an infinite loop.
|
Thanks for the summary and solution! While it looks completely safe, I'll still need to run extensive regression testing as this code is extremely sensitive for TAS demo recording, so it might sit here for a bit until I have a chance to tackle that. |
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.
Fix potential hang after restoring keyframe due to invalid blocklist pointers.
When restoring a keyframe, the blockmap is not cleared and blocklist pointers are modified during P_UnArchiveThinkers. The blockmap is then restored in UnArchiveBlockLinks, but this can leave blocklist pointers in an invalid state.
This can then lead to a hang later when the blocklist is iterated and may get stuck in an infinite loop.
The hang is fairly easy to reproduce using Legacy of Rust when Vassago are present after using keyframe restore.
I chose to simply wipe the blocklist pointers during restoring as this avoids adding extra functions or modifying much existing code. It's basically brute-forcing it.