Fix for endless loop bug in Z_Malloc and flood-protect fix for amtele/amtelemark #146
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
added 2 commits
February 15, 2024 16:08
…even if no images were deleted.
|
I'll take the first issue raised upstream from JACoders#1209, and had already suggested the same fix with for the second issue you raised, in loda said he is going to do it differently. I'll be closing this PR. |
taysta
added a commit
that referenced
this pull request
Feb 17, 2024
…ys being qtrue (from JACoders#1209 and #146)
|
Hi Tom, |
taysta
added a commit
that referenced
this pull request
Feb 17, 2024
* [rend2] Fix overly bright ibl cloth specular * [rend2] Reduce goreVBO size * [OpenJK/Vulkan] Fix endless loop in Z_Malloc due to imageDeleted always being qtrue (from JACoders#1209 and #146) --------- Co-authored-by: SomaZ <17459161+SomaZ@users.noreply.github.com>
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.
Consists of 2 things.
RE_RegisterImages_LevelLoadEnd always returns qtrue atm, due to a variable being wrongly initialized, causing endless loops when called from Z_Alloc. Z_Alloc wants to find ways to free memory... asks RE_RegisterImages_LevelLoadEnd to do so. RE_RegisterImages_LevelLoadEnd reports back that an image was deleted (qtrue) even if no image was deleted. Z_Alloc then thinks ok, let's retry the malloc... endless loop, for hours even, forcing you to quit the process instead of gracefully erroring and disconnecting. You can compare this to the behavior of the original released jka code, it's only supposed to return qtrue if an image was actually deleted, else Z_Alloc can never fall through to the lower down conditions to either delete other stuff like models/sounds or actually gracefully quit. The error was introduced in this commit:
d405b33
Currently amtele/amtelemark is always not ratelimited if sv_newFloodProtect is >1. This may not be desired as in some circumstances people could abuse it to spam teleport sounds/effects. Proposed solution here is to only disable ratelimiting for amtele/amtelemark if sv_newFloodProtect is >2, and otherwise fall back to the old behavior. This allows the old behavior to be restored before the amtele exception was formerly introduced in this commit:
ef4648a