Skip to content

fix incorrect use of std::extent in stockpiles #5869

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 1 commit into from
Aug 8, 2026
+7 −6
Merged

fix incorrect use of std::extent in stockpiles #5869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
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 @@ -59,6 +59,7 @@ Template for new versions:
## New Features

## Fixes
- `stockpiles` will no longer incorrectly size the "rough gem" and "cut gem" vectors, which avoids a crash when viewing stockpile settings. This potentially affects anything that uses blueprints to create a stockpile, including `gui/quantum`

## Misc Improvements

Expand Down
12 changes: 6 additions & 6 deletions plugins/stockpiles/StockpileSerializer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1984,24 +1984,24 @@ void StockpileSettingsSerializer::read_gems(color_ostream& out, DeserializeMode
std::bind(&StockpileSettings::gems, mBuffer),
mSettings->flags.whole,
mSettings->flags.mask_gems,
[&]() {
[&] () {
pgems.cut_other_mats.clear();
pgems.cut_mats.clear();
pgems.rough_other_mats.clear();
pgems.rough_mats.clear();
},
[&](bool all, char val) {
auto & bgems = mBuffer.gems();
[&] (bool all, char val) {
auto& bgems = mBuffer.gems();

unserialize_list_material(out, "mats/rough", all, val, filters, gem_mat_is_allowed,
[&](const size_t& idx) -> const string& { return bgems.rough_mats(idx); },
[&] (const size_t& idx) -> const string& { return bgems.rough_mats(idx); },
bgems.rough_mats_size(), pgems.rough_mats);

unserialize_list_material(out, "mats/cut", all, val, filters, gem_cut_mat_is_allowed,
[&](const size_t& idx) -> const string& { return bgems.cut_mats(idx); },
[&] (const size_t& idx) -> const string& { return bgems.cut_mats(idx); },
bgems.cut_mats_size(), pgems.cut_mats);

const size_t builtin_size = std::extent<decltype(world->raws.mat_table.builtin)>::value;
const size_t builtin_size = world->raws.mat_table.builtin.size();
pgems.rough_other_mats.resize(builtin_size, '\0');
pgems.cut_other_mats.resize(builtin_size, '\0');
if (all) {
Expand Down
Loading