Fix segfault in lookupMaterialColor from unbounded color index - #255
Merged
Conversation
state_color[0] was used directly as an index into descriptors.colors without bounds-checking. Materials with an invalid/out-of-range color index (observed with matIndex=307) caused a segfault instead of falling back to defaultColor.
ab9rf
approved these changes
Jul 12, 2026
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.
Fixes a segfault in lookupMaterialColor caused by an unbounded array index
state_color[0] was used directly as an index into descriptors.colors without checking whether it was in range. For materials with an invalid or out-of-range color index (reproduced with an inorganic material, matIndex=307), this caused a segfault instead of falling back gracefully.
This adds a bounds check before dereferencing, falling back to defaultColor — consistent with the fallback behavior already used elsewhere in this same function — when the index is invalid.
Reproduced via gdb backtrace:
Thread 21 "dwarfort" received signal SIGSEGV, Segmentation fault.
lookupMaterialColor (matType=0, matIndex=307, ...) at ContentLoader.cpp:710
710 return al_map_rgb_f(cd->red, cd->green, cd->blue) * dyeColor;