Prevent recursion in sm_ServerCommandEx (fixes #967)#2133
Merged
psychonic merged 2 commits intoalliedmodders:masterfrom Apr 18, 2024
Merged
Prevent recursion in sm_ServerCommandEx (fixes #967)#2133psychonic merged 2 commits intoalliedmodders:masterfrom
psychonic merged 2 commits intoalliedmodders:masterfrom
Conversation
asherkin
approved these changes
Apr 18, 2024
Member
asherkin
left a comment
There was a problem hiding this comment.
Thank you for the PR! It's really nice to see this bug fixed.
Co-authored-by: Erin <[email protected]>
Member
|
Thanks! |
This file contains hidden or 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
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.
This fixes the issue with recursive
ServerCommandExin old engine (pre-Nuclear Dawn). The issue was that ifServerCommandExis called recursively,sm_conhook_startandsm_conhook_stopwill be added to the console buffer again. When that happens, it will setg_OriginalSpewOutputFunctoSourcemodSpewOutputFuncbecause the earlier call set the spew func toSourcemodSpewOutputFunc, and then when a line is printed,SourcemodSpewOutputFuncwill callSourcemodSpewOutputFuncindefinitely until the stack overflows (in debug) or you get bored (in release). This patch fixes that by checking if we're already catching spew before addingsm_conhook_start/stopagain.