From 10a19b2a75f75fb4c3232d26751e40bd6a5f53a1 Mon Sep 17 00:00:00 2001
From: Charlemagne Lasse <charlemagnelasse@gmail.com>
Date: Wed, 13 Apr 2022 11:54:30 +0200
Subject: [PATCH] 0032930: Modeling Algorithms - Crash in
 PerformIntersectionAtEnd when no face was found

The PerformIntersectionAtEnd code is currently not handling all the faces
correctly. If it retrieves Face[0] as F, it can happen that the previously
ran code didn't actually retrieve any faces in this array at all.

For example when:

* "if (nface==3)" is true
  - "if (!findonf1)" is true (doesn't assign any faces to this array)
  - "if (!findonf2)" is true (doesn't assign any faces to this array)
  - "if (state == ChFiDS_OnSame)" is not true (because it is
    ChFiDS_AllSame)
  - "if (findonf1 && !isOnSame1)" cannot be true (see above, but would
    handle faces)
  - "if (findonf2 && !isOnSame2)" cannot be true (see above, but would
    handle faces)
  - "if (isOnSame2)" is false (but would also handle faces)

Since no faces were assigned here, F would be a NULL face. As result, the
function will crash when trying to access the Surface behind the face via
`BRep_Tool::Surface(F);`.

While the best approach would be to identify the implementation bug in the
algorithm behind PerformIntersectionAtEnd, a check + exception is used
instead because the actual algorithm is not known.

Signed-off-by: Charlemagne Lasse <charlemagnelasse@gmail.com>
---
 src/ChFi3d/ChFi3d_Builder_C1.cxx |  3 +++
 tests/bugs/modalg_8/bug32930     | 26 ++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 tests/bugs/modalg_8/bug32930

diff --git a/src/ChFi3d/ChFi3d_Builder_C1.cxx b/src/ChFi3d/ChFi3d_Builder_C1.cxx
index 93f20646ac..1996ca9d19 100644
--- a/src/ChFi3d/ChFi3d_Builder_C1.cxx
+++ b/src/ChFi3d/ChFi3d_Builder_C1.cxx
@@ -2115,6 +2115,9 @@ void ChFi3d_Builder::PerformIntersectionAtEnd(const Standard_Integer Index)
       F=Face[nb-1];
       if (!prolface[nb-1]) faceprol[nb-1]=F;
     }
+
+    if (F.IsNull()) throw Standard_NullObject("IntersectionAtEnd : Trying to intersect with NULL face");
+
     Sfacemoins1=BRep_Tool::Surface(F);
     Handle(Geom_Curve) cint;
     Handle(Geom2d_Curve) C2dint1, C2dint2,cface,cfacemoins1;
diff --git a/tests/bugs/modalg_8/bug32930 b/tests/bugs/modalg_8/bug32930
new file mode 100644
index 0000000000..be24c74646
--- /dev/null
+++ b/tests/bugs/modalg_8/bug32930
@@ -0,0 +1,26 @@
+puts "TODO OCC32930 ALL: Tcl Exception"
+puts "TODO OCC32930 ALL: TEST INCOMPLETE"
+
+puts "============"
+puts "OCC32930: Modeling Algorithms - Crash in PerformIntersectionAtEnd when no face was found"
+puts "============"
+puts ""
+
+# Load & prepare data.
+restore [locate_data_file bug32930.brep] b
+explode b E
+
+# Make screenshot before filleting.
+smallview
+donly b b_10
+fit
+xwd $imagedir/${test_image}_1.png
+
+# Make fillet.
+blend result b 1 b_10
+
+# Make screenshot after filleting.
+donly result
+fit
+xwd $imagedir/${test_image}_2.png
+