From 4abf89322e81491cb02b0debfe2026af9c0a5f5e Mon Sep 17 00:00:00 2001
From: Florian Foinant-Willig <flachyjoe@gmail.com>
Date: Wed, 19 Jun 2024 21:18:57 +0200
Subject: [PATCH] 0033743: Modeling Algorithm - fix crash with
 BRepFilletAPI_MakeChamfer

Handle a case where a newly created face does not contain a required
edge. Since the null edge was passed in, the algorithm would eventually
crash when trying to access its members.
---
 src/ChFi3d/ChFi3d_Builder_2.cxx | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/ChFi3d/ChFi3d_Builder_2.cxx b/src/ChFi3d/ChFi3d_Builder_2.cxx
index 2f4764c9f0..1c17fd3365 100644
--- a/src/ChFi3d/ChFi3d_Builder_2.cxx
+++ b/src/ChFi3d/ChFi3d_Builder_2.cxx
@@ -1249,12 +1249,22 @@ ChFi3d_Builder::StartSol(const Handle(ChFiDS_Spine)&    Spine,
 	TopoDS_Face newface = Fv;
 	newface.Orientation(TopAbs_FORWARD);
 	TopExp_Explorer ex;
+	Standard_Boolean found = 0;
 	for(ex.Init(newface,TopAbs_EDGE); ex.More(); ex.Next()){
 	  if(ex.Current().IsSame(E)){
 	    newedge = TopoDS::Edge(ex.Current());
+	    found = 1;
 	    break;
 	  }
 	}
+	if (!found){
+	  // E not in newface, the state is preserved and False is returned
+	  HS->Initialize(F);
+	  W = CP.ParameterOnArc();
+	  pc = BRep_Tool::CurveOnSurface(E,F,Uf,Ul);
+	  pons = pc->Value(W);
+	  return Standard_False;
+	}
 	HC->Initialize(newedge,Fv);
 	pons = HC->Value(W);
 	HCref->Initialize(E,F);