Skip to content

Fix segfault in lookupMaterialColor from unbounded color index #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ab9rf merged 2 commits into from
Jul 12, 2026
Merged

Fix segfault in lookupMaterialColor from unbounded color index #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2a6173
Fix segfault in lookupMaterialColor from unbounded color index
Jul 12, 2026
0ed936d
Add changelog entry
Jul 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ContentLoader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,8 +743,11 @@ ALLEGRO_COLOR lookupMaterialColor(int matType, int matIndex, int dyeType, int dy
DFColor:
DFHack::MaterialInfo mat;
if(mat.decode(matType, matIndex)) {
auto cd = df::global::world->raws.descriptors.colors[mat.material->state_color[0]];
return al_map_rgb_f(cd->red, cd->green, cd->blue) * dyeColor;
int16_t colorIdx = mat.material->state_color[0];
if (colorIdx >= 0 && size_t(colorIdx) < df::global::world->raws.descriptors.colors.size()) {
auto cd = df::global::world->raws.descriptors.colors[colorIdx];
return al_map_rgb_f(cd->red, cd->green, cd->blue) * dyeColor;
}
}
return defaultColor * dyeColor;
}
Expand Down
1 change: 1 addition & 0 deletions docs/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ Template for new versions:
## New Features

## Fixes
- `stonesense`: fixed a crash when rendering materials with an out-of-range color index

## Misc Improvements

Expand Down
Loading