Return -1 instead of raw index when ConvertIndex lookup fails - #1234
Open
acato wants to merge 1 commit into
Open
Return -1 instead of raw index when ConvertIndex lookup fails#1234acato wants to merge 1 commit into
acato wants to merge 1 commit into
Conversation
When a savegame enum index exceeds the conversion table size, the raw attacker-controlled index was passed through unchanged to EnumMap::set(), where bounds checks (FAssert) are stripped in Release builds. This enabled out-of-bounds writes into EnumMap storage, corrupting adjacent fields in game objects. Returning -1 (the established "removed entry" sentinel) causes callers to safely skip the value instead of writing out-of-bounds. Fixes We-the-People-civ4col-mod#1231 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
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
1 participant
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.
Summary
ConvertIndex()to return -1 (the established "removed entry" sentinel) when a savegame enum index exceeds the conversion table size, instead of passing through the raw attacker-controlled indexEnumMap::set()where the bounds check (FAssert) is stripped in Release builds, enabling out-of-bounds writes into game object memoryFixes #1231
Test plan
🤖 Generated with Claude Code