blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Fix: crash when adding curves in curves sculpt mode with interpolation 

There were two issues:
* The `new_point_counts_per_curve` was one too large, resulting in
  `interpolate_from_neighbors` reading invalid memory.
* Writing the counts into the existing offsets array didn't quite work
  because there can be a collision at the offset right between the
  last old curve and the first new point. There was a race condition
  where this value could be read and written at the same time.
This commit is contained in:
Jacques Lucke 2023-01-24 17:30:24 +01:00
parent 62743dde11
commit 6899474615
Notes: blender-bot 2023-05-05 11:20:11 +02:00 
Referenced by issue #104129, Repeatable crashing bug with 'Point Count' option in Add tool while curve sculpting.
Referenced by issue #104118, Geometry Nodes: Sculpting with Puff and Add tool crashes
Referenced by issue #107637, Regression: Hair sculpt crash on an empty hair object with "Density" brush
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/geometry/intern/add_curves_on_mesh.cc
View File

@ -286,19 +286,25 @@ AddCurvesOnMeshOutputs add_curves_on_mesh(CurvesGeometry &curves,
/* Compute new curve offsets. */
MutableSpan<int> curve_offsets = curves.offsets_for_write();
MutableSpan<int> new_point_counts_per_curve = curve_offsets.drop_front(old_curves_num);
if (inputs.interpolate_point_count) {
Array<int> new_point_counts_per_curve(added_curves_num);
if (inputs.interpolate_point_count && old_curves_num > 0) {
const OffsetIndices<int> old_points_by_curve{curve_offsets.take_front(old_curves_num + 1)};
interpolate_from_neighbors<int>(
neighbors_per_curve,
inputs.fallback_point_count,
[&](const int curve_i) { return curve_offsets[curve_i + 1] - curve_offsets[curve_i]; },
[&](const int curve_i) { return old_points_by_curve.size(curve_i); },
new_point_counts_per_curve);
}
else {
new_point_counts_per_curve.fill(inputs.fallback_point_count);
}
offset_indices::accumulate_counts_to_offsets(curve_offsets.drop_front(old_curves_num),
old_points_num);
curve_offsets[old_curves_num] = old_points_num;
int offset = old_points_num;
for (const int i : new_point_counts_per_curve.index_range()) {
const int point_count_in_curve = new_point_counts_per_curve[i];
curve_offsets[old_curves_num + i + 1] = offset + point_count_in_curve;
offset += point_count_in_curve;
}
const int new_points_num = curves.offsets().last();
curves.resize(new_points_num, new_curves_num);