From e8a36f3a028c57b789c2fd5c9818be9b386ae3a1 Mon Sep 17 00:00:00 2001
From: astromko <astromko@opencascade.com>
Date: Thu, 15 Feb 2024 14:12:39 +0000
Subject: [PATCH] 0033383: Modeling Algorithms - Wire/Face creation problem

ProjCurve3d and BRepAlgo_FaceRestrictor::Perform functions should not continue to work and should terminate if the BRep_Tool::Curve function returns null pointer.
---
 src/BRepAlgo/BRepAlgo_FaceRestrictor.cxx | 17 ++++++++++++++---
 tests/bugs/modalg_8/bug33383             | 14 ++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 tests/bugs/modalg_8/bug33383

diff --git a/src/BRepAlgo/BRepAlgo_FaceRestrictor.cxx b/src/BRepAlgo/BRepAlgo_FaceRestrictor.cxx
index 05c849b353..5d668015e6 100644
--- a/src/BRepAlgo/BRepAlgo_FaceRestrictor.cxx
+++ b/src/BRepAlgo/BRepAlgo_FaceRestrictor.cxx
@@ -103,7 +103,7 @@ static Standard_Boolean  ChangePCurve (TopoDS_Edge&          E,
 //purpose  : 
 //=======================================================================
 
-static void ProjCurve3d (TopoDS_Edge&          E,
+static bool ProjCurve3d (TopoDS_Edge&          E,
                          const Handle(Geom_Surface)& S,
                          TopLoc_Location&      L)
 {
@@ -111,6 +111,10 @@ static void ProjCurve3d (TopoDS_Edge&          E,
   TopLoc_Location           LE;
   Standard_Real             f,l;
   Handle(Geom_Curve)        C  = BRep_Tool::Curve(E,LE,f,l);
+  if (C.IsNull())
+  {
+    return false;
+  }
   Handle(Geom_TrimmedCurve) CT = new Geom_TrimmedCurve(C,f,l);
   
   TopLoc_Location LL = L.Inverted().Multiplied(LE);
@@ -118,6 +122,7 @@ static void ProjCurve3d (TopoDS_Edge&          E,
   
   Handle(Geom2d_Curve) C2 = GeomProjLib::Curve2d (CT,S);
   BB.UpdateEdge(E,C2,S,L,Precision::Confusion());
+  return true;
 }
 
 //=======================================================================
@@ -165,13 +170,19 @@ void BRepAlgo_FaceRestrictor::Perform()
         // no pcurve on the reference surface.
         if (modeProj) {
           // Projection of the 3D curve on surface.
-          ProjCurve3d ( E, S, L);
+          if (!ProjCurve3d(E, S, L))
+          {
+            return;
+          }
         }
         else {
           // return the first pcurve glued on <S>
           Standard_Boolean YaPCurve = ChangePCurve (E, S, L);
           if (!YaPCurve) {
-            ProjCurve3d (E, S, L);
+            if (!ProjCurve3d(E, S, L))
+            {
+              return;
+            }
           }
         }
       }
diff --git a/tests/bugs/modalg_8/bug33383 b/tests/bugs/modalg_8/bug33383
new file mode 100644
index 0000000000..e9a56c2705
--- /dev/null
+++ b/tests/bugs/modalg_8/bug33383
@@ -0,0 +1,14 @@
+puts "========================================================="
+puts "0033383: Modeling Algorithms - Wire/Face creation problem"
+puts "========================================================="
+puts ""
+
+pload MODELING
+restore [locate_data_file bug33383.brep] a
+connectedges res a 1e-07 0
+explode res
+mkplane pln1 res_1 1
+
+if ![catch { buildfaces rebf pln1 res_2 }] then {
+  puts "Error: buildfaces command should be failed"
+}