From 8e7dc6f465d8cd5cb524e1c1b485bc5979ec7dcf Mon Sep 17 00:00:00 2001
From: msv <msv@opencascade.com>
Date: Tue, 13 Aug 2019 16:00:48 +0300
Subject: [PATCH] 0030897: Modeling Algorithms - Crash in UnifySameDomain
 [Regression]

The regression caused by the patch for 0030534 has been eliminated. For that the method InsertWiresIntoFaces() has been corrected: the face to which a wire is added is first oriented as forward.
---
 .../ShapeUpgrade_UnifySameDomain.cxx          | 13 +++++++++---
 tests/bugs/modalg_7/bug30897                  | 20 +++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 tests/bugs/modalg_7/bug30897

diff --git a/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx b/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx
index 4d4172193d..6489c4ec53 100644
--- a/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx
+++ b/src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx
@@ -377,7 +377,7 @@ static void InsertWiresIntoFaces(const TopTools_SequenceOfShape& theWires,
     const TopoDS_Edge& anEdge = TopoDS::Edge(iter.Value());
     BRepAdaptor_Curve2d BAcurve2d(anEdge, theRefFace);
     gp_Pnt2d aPnt2d = BAcurve2d.Value((BAcurve2d.FirstParameter() + BAcurve2d.LastParameter())/2.);
-    TopoDS_Face RequiredFace;
+    TopoDS_Shape RequiredFace;
     for (Standard_Integer jj = 1; jj <= theFaces.Length(); jj++)
     {
       const TopoDS_Face& aFace = TopoDS::Face(theFaces(jj));
@@ -385,11 +385,18 @@ static void InsertWiresIntoFaces(const TopTools_SequenceOfShape& theWires,
       TopAbs_State aStatus = Classifier.Perform(aPnt2d);
       if (aStatus == TopAbs_IN)
       {
-        RequiredFace = aFace;
+        RequiredFace = aFace.Oriented (TopAbs_FORWARD);
         break;
       }
     }
-    BB.Add(RequiredFace, aWire);
+    if (!RequiredFace.IsNull())
+    {
+      BB.Add(RequiredFace, aWire);
+    }
+    else
+    {
+      Standard_ASSERT_INVOKE ("ShapeUpgrade_UnifySameDomain: wire remains unclassified");
+    }
   }
 }
 
diff --git a/tests/bugs/modalg_7/bug30897 b/tests/bugs/modalg_7/bug30897
new file mode 100644
index 0000000000..3d338544b3
--- /dev/null
+++ b/tests/bugs/modalg_7/bug30897
@@ -0,0 +1,20 @@
+puts "======================================================="
+puts "0030897: Modeling Algorithms - Crash in UnifySameDomain"
+puts "======================================================="
+puts ""
+
+restore [locate_data_file bug30897_bleriot_16.brep] a
+
+unifysamedom result a
+
+checkshape result
+
+checknbshapes result -solid 1 -shell 1 -face 51 -wire 121 -edge 379 -vertex 324
+
+set tolres [checkmaxtol result]
+
+if { ${tolres} > 0.00385} {
+   puts "Error: bad tolerance of result"
+}
+
+checkprops result -v 403016