juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-08-27 11:59:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix OOB heap write from stale filament_self_index on --load-filaments. Fixes Github Issue #14181

Browse Source
This commit is contained in:
Hanif Koh
2026-08-27 17:54:01 +08:00
parent 92b394fe4e
commit 298d0964b6
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/OrcaSlicer.cpp
View File

@@ -3140,7 +3140,22 @@ int CLI::run(int argc, char **argv)
std::vector<int> old_variant_counts(filament_count, 1), new_variant_counts;
ConfigOptionInts* filament_self_index_opt = m_print_config.option<ConfigOptionInts>("filament_self_index");
if (!filament_self_index_opt) {
bool need_regenerate_self_index = !filament_self_index_opt;
if (filament_self_index_opt) {
// a filament_self_index carried over from a project with a different
// filament_count can imply more distinct filament groups than currently exist.
// old_start_indice/old_variant_counts below are sized to filament_count, so an
// unreconciled index walks old_start_indice[++k] past its bounds (heap corruption).
int max_self_index = 0;
for (int v : filament_self_index_opt->values)
max_self_index = std::max(max_self_index, v);
if (max_self_index > filament_count) {
BOOST_LOG_TRIVIAL(warning) << boost::format("filament_self_index implies %1% filament groups but filament_count is %2%, regenerating")
% max_self_index % filament_count;
need_regenerate_self_index = true;
}
}
if (need_regenerate_self_index) {
filament_self_index_opt = m_print_config.option<ConfigOptionInts>("filament_self_index", true);
std::vector<int>& filament_self_indice = filament_self_index_opt->values;
filament_self_indice.resize(filament_count);