juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-11 02:57:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move empty-vector guard into DynamicPrintConfig::get_filament_type

Browse Source
This commit is contained in:
Hanif Koh
2026-09-01 12:09:29 +08:00
parent 76c8239b13
commit 7b029f6f9d
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/OrcaSlicer.cpp
View File

@@ -6497,7 +6497,6 @@ int CLI::run(int argc, char **argv)
bool need_create_thumbnail_group = false, need_create_no_light_group = false, need_create_top_group = false; bool need_create_thumbnail_group = false, need_create_no_light_group = false, need_create_top_group = false;
// get type and color for platedata // get type and color for platedata
auto* filament_types = dynamic_cast<const ConfigOptionStrings*>(m_print_config.option("filament_type"));
const ConfigOptionStrings* filament_color = dynamic_cast<const ConfigOptionStrings *>(m_print_config.option("filament_colour")); const ConfigOptionStrings* filament_color = dynamic_cast<const ConfigOptionStrings *>(m_print_config.option("filament_colour"));
auto* filament_id = dynamic_cast<const ConfigOptionStrings*>(m_print_config.option("filament_ids")); auto* filament_id = dynamic_cast<const ConfigOptionStrings*>(m_print_config.option("filament_ids"));
const ConfigOptionFloats* nozzle_diameter_option = dynamic_cast<const ConfigOptionFloats *>(m_print_config.option("nozzle_diameter")); const ConfigOptionFloats* nozzle_diameter_option = dynamic_cast<const ConfigOptionFloats *>(m_print_config.option("nozzle_diameter"));
@@ -6516,20 +6515,11 @@ int CLI::run(int argc, char **argv)
plate_data->nozzle_diameters = nozzle_diameter_str; plate_data->nozzle_diameters = nozzle_diameter_str;
for (auto it = plate_data->slice_filaments_info.begin(); it != plate_data->slice_filaments_info.end(); it++) { for (auto it = plate_data->slice_filaments_info.begin(); it != plate_data->slice_filaments_info.end(); it++) {
// ConfigOptionVector::get_at() falls back to values.front() when the index is out of // get_at() on an empty vector option is UB - these can be unpopulated on a from-scratch slice
// range, but that is undefined behavior when values is empty outright (e.g. filament_ids
// is never populated on a from-scratch slice with no --load-filaments) - guard every
// get_at() here on the vector actually having an entry at it->id before calling it.
bool valid_id = it->id >= 0;
std::string display_filament_type; std::string display_filament_type;
if (valid_id && filament_types && static_cast<size_t>(it->id) < filament_types->values.size()) it->type = m_print_config.get_filament_type(display_filament_type, it->id);
it->type = m_print_config.get_filament_type(display_filament_type, it->id); it->color = (filament_color && !filament_color->values.empty()) ? filament_color->get_at(it->id) : "#FFFFFF";
it->color = (valid_id && filament_color && static_cast<size_t>(it->id) < filament_color->values.size()) ? it->filament_id = (filament_id && !filament_id->values.empty()) ? filament_id->get_at(it->id) : "";
filament_color->get_at(it->id) :
"#FFFFFF";
it->filament_id = (valid_id && filament_id && static_cast<size_t>(it->id) < filament_id->values.size()) ?
filament_id->get_at(it->id) :
"";
} }
if (!plate_data->plate_thumbnail.is_valid()) { if (!plate_data->plate_thumbnail.is_valid()) {

10
src/libslic3r/PrintConfig.cpp
View File

@@ -9866,7 +9866,15 @@ std::string DynamicPrintConfig::get_filament_type(std::string &displayed_filamen
auto* filament_type = dynamic_cast<const ConfigOptionStrings*>(this->option("filament_type")); auto* filament_type = dynamic_cast<const ConfigOptionStrings*>(this->option("filament_type"));
auto* filament_is_support = dynamic_cast<const ConfigOptionBools*>(this->option("filament_is_support")); auto* filament_is_support = dynamic_cast<const ConfigOptionBools*>(this->option("filament_is_support"));
if (!filament_type) // get_at() on an empty vector option is undefined behavior (.front() of an empty vector),
// and e.g. filament_id is never populated on a CLI from-scratch slice - treat an empty
// option the same as a missing one.
if (filament_id && filament_id->values.empty())
filament_id = nullptr;
if (filament_is_support && filament_is_support->values.empty())
filament_is_support = nullptr;
if (!filament_type || filament_type->values.empty())
return ""; return "";
if (!filament_is_support) { if (!filament_is_support) {