fix: bound four unbounded expansions in STEP and IGES import
Each of these asks the allocator for tens of gigabytes, or runs for hours, from a file of a few kilobytes to a few megabytes. An allocation failure is an abort, so no panic guard can report it and the user's unsaved work is gone. - IGES composite curves (102) name their children by pointer, and a tree whose every node names the same child twice fans out to 2^30 leaf visits under the depth cap. Count the entities visited and the segments produced against one budget, since a node that yields no segment trips no bound on the output, and refuse a composite curve that contains itself. - IGES directory entries could all name the same parameter range, each materialising it as its own string and token list. Keep the total text proportional to the parameter section the file carries. - STEP knot multiplicities were expanded into one value each before the knot count was compared with the control points: 20 million knots of multiplicity 64 built a 10 GB vector only to be rejected. Check the sum first. - One STEP face could list any number of boundary loops, each cloning its edge handles into a new wire that the face extent then samples. Cap the loops and the edges they hold; 100,000 bounds went from 2.1 GB to an immediate error. Also guard the IGES translation, which was the one importer stage outside every panic guard, keep the vertex-sewing bucket key clear of the overflow its neighbour lookup caused for coordinates near f64's range, and count how often a loop passes each vertex once instead of once per edge. Fixes #146 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> (cherry picked from commit c32792b71c76d74348ad5002d8d2da870937e58e)
This commit is contained in:
1 parent
a094fa46b5
commit
b5fb86f245
5 files changed
+199
-12
No files matched your search
@@ -622,3 +622,57 @@ fn glued_halves_export_as_whole_faces() {
|
||||
// Box sides and caps (6) and two holes.
|
||||
assert_eq!(imp.bodies[0].file_faces, 8);
|
||||
}
|
||||
|
||||
/// Knot multiplicities are expanded into one value each before the knot count is compared with
|
||||
/// the control points, so the sum has to be checked first: 1,000,000 knots of multiplicity 64
|
||||
/// against two control points asked for a 500 MB vector (20,000,000 for 10 GB) only to reject
|
||||
/// it afterwards, and an allocation failure aborts the process where an error does not.
|
||||
#[test]
|
||||
fn knot_multiplicities_are_checked_before_they_are_expanded() {
|
||||
let curve = |n: usize, mult: usize| {
|
||||
let knots: Vec<String> = (0..n).map(|i| format!("{i}.")).collect();
|
||||
let mults: Vec<String> = std::iter::repeat_n(mult.to_string(), n).collect();
|
||||
format!(
|
||||
"{HEAD}#1=CARTESIAN_POINT('',(0.,0.,0.));\n#2=CARTESIAN_POINT('',(1.,0.,0.));\n\
|
||||
#3=B_SPLINE_CURVE_WITH_KNOTS('',1,(#1,#2),.UNSPECIFIED.,.F.,.F.,({}),({}),.UNSPECIFIED.);\n{TAIL}",
|
||||
mults.join(","),
|
||||
knots.join(",")
|
||||
)
|
||||
};
|
||||
let read = |text: &str| {
|
||||
let ex = p21::parse(text).unwrap();
|
||||
let cx = Ctx { ex: &ex, len: 1.0, ang: 1.0, tol: 1e-6 };
|
||||
geom::curve(&cx, 3, 0)
|
||||
};
|
||||
let t = std::time::Instant::now();
|
||||
let error = read(&curve(1_000_000, 64)).unwrap_err();
|
||||
assert!(error.contains("knot multiplicities do not match"), "{error}");
|
||||
assert!(t.elapsed() < std::time::Duration::from_secs(5), "took {:?}", t.elapsed());
|
||||
// A degree-1 curve with two control points needs exactly four knot values.
|
||||
assert!(read(&curve(2, 2)).is_ok());
|
||||
assert!(read(&curve(4, 1)).is_ok());
|
||||
assert!(read(&curve(2, 3)).is_err());
|
||||
}
|
||||
|
||||
/// One `ADVANCED_FACE` may list any number of bounds, and each one clones its edge handles into
|
||||
/// a new wire that the face extent then samples. A face naming the same loop a million times
|
||||
/// held 1e11 handles.
|
||||
#[test]
|
||||
fn faces_with_too_many_bounds_are_refused() {
|
||||
let good = step_export(&[&box_solid(Vec3::ZERO, Vec3::new(5.0, 5.0, 5.0)).unwrap()], "t").unwrap();
|
||||
// One extra face on the cube's shell, listing its outer bound 100,000 times.
|
||||
let bounds = std::iter::repeat_n("#900001", 100_000).collect::<Vec<_>>().join(",");
|
||||
let mut extra = format!("#900000=ADVANCED_FACE('',({bounds}),#900010,.T.);\n");
|
||||
extra += "#900001=FACE_OUTER_BOUND('',#900002,.T.);\n#900002=EDGE_LOOP('',(#900003));\n";
|
||||
extra += "#900003=ORIENTED_EDGE('',*,*,#900004,.T.);\n#900004=EDGE_CURVE('',#900005,#900005,#900007,.T.);\n";
|
||||
extra += "#900005=VERTEX_POINT('',#900006);\n#900006=CARTESIAN_POINT('',(0.,0.,0.));\n";
|
||||
extra += "#900007=LINE('',#900006,#900008);\n#900008=VECTOR('',#900009,1.);\n#900009=DIRECTION('',(1.,0.,0.));\n";
|
||||
extra += "#900010=PLANE('',#900011);\n#900011=AXIS2_PLACEMENT_3D('',#900006,#900012,#900009);\n#900012=DIRECTION('',(0.,0.,1.));\n";
|
||||
let text =
|
||||
good.replacen("CLOSED_SHELL('',(", "CLOSED_SHELL('',(#900000,", 1).replacen("ENDSEC;\nEND-ISO", &format!("{extra}ENDSEC;\nEND-ISO"), 1);
|
||||
|
||||
let start = std::time::Instant::now();
|
||||
let imp = step_import(&text).unwrap();
|
||||
assert!(imp.warnings.iter().any(|w| w.contains("boundary loops")), "{:?}", imp.warnings);
|
||||
assert!(start.elapsed() < std::time::Duration::from_secs(10), "took {:?}", start.elapsed());
|
||||
}
|
||||
Reference in new issue
Block a user