mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-09 10:16:50 +00:00
fix: out-of-bounds write migrating per-variant values when switching printers (#15456)
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -479,3 +479,84 @@ TEST_CASE("update_values_to_printer_extruders_for_multiple_filaments resolves pe
|
||||
REQUIRE(config.option<ConfigOptionInts>("filament_self_index")->values == std::vector<int>({1, 2}));
|
||||
}
|
||||
}
|
||||
|
||||
// update_values_from_multi_to_multi_2 walks the DESTINATION PRINTER's variant list while writing
|
||||
// into a row taken from the destination PRINT preset, whose arrays are sized to its own
|
||||
// print_extruder_variant. Those two widths disagree until the print preset is re-selected for the
|
||||
// new printer -- Tab::load_current_preset() runs this migration first -- so a project authored on
|
||||
// a single-variant printer, opened and switched to a wider one, wrote past the end of the row.
|
||||
TEST_CASE("update_values_from_multi_to_multi_2 sizes the destination row to the variant count",
|
||||
"[Config][VariantExpansion]")
|
||||
{
|
||||
const std::vector<std::string> src_variants{"Direct Drive Standard"};
|
||||
const std::vector<std::string> dst_variants{"Direct Drive Standard", "Direct Drive High Flow",
|
||||
"Direct Drive Standard", "Direct Drive High Flow"};
|
||||
const std::set<std::string> keys{"outer_wall_speed"};
|
||||
|
||||
// The per-object override as authored on the single-variant printer.
|
||||
const auto object_override = [] {
|
||||
DynamicPrintConfig c;
|
||||
c.option<ConfigOptionFloatsNullable>("outer_wall_speed", true)->values = {42.};
|
||||
return c;
|
||||
};
|
||||
|
||||
SECTION("a row narrower than the variant list is grown, not overrun") {
|
||||
DynamicPrintConfig object_config = object_override();
|
||||
DynamicPrintConfig dst;
|
||||
dst.option<ConfigOptionFloatsNullable>("outer_wall_speed", true)->values = {200.};
|
||||
|
||||
REQUIRE(object_config.update_values_from_multi_to_multi_2(src_variants, dst_variants, dst, keys) == 0);
|
||||
|
||||
const auto& out = object_config.option<ConfigOptionFloatsNullable>("outer_wall_speed")->values;
|
||||
REQUIRE(out.size() == dst_variants.size());
|
||||
// Both "Direct Drive Standard" columns match the source variant, so they take the override.
|
||||
CHECK(out[0] == Catch::Approx(42.));
|
||||
CHECK(out[2] == Catch::Approx(42.));
|
||||
// The High Flow columns have no matching source variant: nil, so the destination keeps
|
||||
// tracking the print preset rather than being pinned to another variant's value.
|
||||
CHECK(std::isnan(out[1]));
|
||||
CHECK(std::isnan(out[3]));
|
||||
}
|
||||
|
||||
// The regression guard: where the row already matches the variant list -- every case that was
|
||||
// not corrupting the heap -- the resize is a no-op and the output is unchanged.
|
||||
SECTION("a correctly sized row is untouched") {
|
||||
DynamicPrintConfig object_config = object_override();
|
||||
DynamicPrintConfig dst;
|
||||
dst.option<ConfigOptionFloatsNullable>("outer_wall_speed", true)->values = {200., 500., 210., 510.};
|
||||
|
||||
REQUIRE(object_config.update_values_from_multi_to_multi_2(src_variants, dst_variants, dst, keys) == 0);
|
||||
|
||||
const auto& out = object_config.option<ConfigOptionFloatsNullable>("outer_wall_speed")->values;
|
||||
REQUIRE(out.size() == 4);
|
||||
CHECK(out[0] == Catch::Approx(42.)); // matched -> override
|
||||
CHECK(out[1] == Catch::Approx(500.)); // unmatched -> preset value preserved
|
||||
CHECK(out[2] == Catch::Approx(42.));
|
||||
CHECK(out[3] == Catch::Approx(510.));
|
||||
}
|
||||
|
||||
// is_nil(idx) indexes values[idx] with no bounds check, so a source shorter than its own
|
||||
// variant list read out of range before the guard was added.
|
||||
SECTION("a source shorter than its variant list is read in range") {
|
||||
DynamicPrintConfig object_config = object_override(); // one value...
|
||||
DynamicPrintConfig dst;
|
||||
dst.option<ConfigOptionFloatsNullable>("outer_wall_speed", true)->values = {200., 500.};
|
||||
|
||||
REQUIRE(object_config.update_values_from_multi_to_multi_2(
|
||||
{"Direct Drive Standard", "Direct Drive Standard"}, // ...but two source variants
|
||||
{"Direct Drive Standard", "Direct Drive High Flow"}, dst, keys) == 0);
|
||||
|
||||
const auto& out = object_config.option<ConfigOptionFloatsNullable>("outer_wall_speed")->values;
|
||||
REQUIRE(out.size() == 2);
|
||||
CHECK(out[0] == Catch::Approx(42.));
|
||||
CHECK(out[1] == Catch::Approx(500.));
|
||||
}
|
||||
|
||||
SECTION("an empty destination variant list is refused") {
|
||||
DynamicPrintConfig object_config = object_override();
|
||||
DynamicPrintConfig dst;
|
||||
dst.option<ConfigOptionFloatsNullable>("outer_wall_speed", true)->values = {200.};
|
||||
|
||||
CHECK(object_config.update_values_from_multi_to_multi_2(src_variants, {}, dst, keys) == -1);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user