From e8dec5e17143cb9ce4e1fcae1af14e4456de102d Mon Sep 17 00:00:00 2001
From: msv <msv@opencascade.com>
Date: Mon, 15 Jul 2019 19:47:14 +0300
Subject: [PATCH] 0030790: [REGRESSION] Modeling Algorithms - Crash when
 loading specific step file

The problem occurred when the algorithm IntCurvesFace_Intersector was called for a face occupying zero extension along V direction. This is obviously a bad face, but we need to have the algorithm not crashing the application. So, the algorithm has been protected against such input data. At attempt to make calculations it establishes NotDone status.

Bad test case tests/de/step_3/D9 has been updated.
False memory leak detection has been suppressed in tests/bugs/fclasses/bug7287_2.
---
 .../IntCurvesFace_Intersector.cxx             | 21 ++++++++++++-------
 .../IntCurvesFace_Intersector.hxx             |  1 +
 tests/bugs/fclasses/bug7287_2                 |  2 +-
 tests/bugs/step/bug30790                      | 13 ++++++++++++
 tests/de/step_3/D9                            |  2 +-
 5 files changed, 30 insertions(+), 9 deletions(-)
 create mode 100644 tests/bugs/step/bug30790

diff --git a/src/IntCurvesFace/IntCurvesFace_Intersector.cxx b/src/IntCurvesFace/IntCurvesFace_Intersector.cxx
index 28936081f2..6c6d3ce24b 100644
--- a/src/IntCurvesFace/IntCurvesFace_Intersector.cxx
+++ b/src/IntCurvesFace/IntCurvesFace_Intersector.cxx
@@ -132,6 +132,7 @@ IntCurvesFace_Intersector::IntCurvesFace_Intersector(const TopoDS_Face& Face,
 : 
   Tol(aTol),
   done(Standard_False),
+  myReady(Standard_False),
   nbpnt(0),
   PtrOnPolyhedron(NULL),
   PtrOnBndBounding(NULL),
@@ -175,7 +176,7 @@ IntCurvesFace_Intersector::IntCurvesFace_Intersector(const TopoDS_Face& Face,
     if (nbsu > aMaxSamples) nbsu = aMaxSamples;
     if (nbsv > aMaxSamples) nbsv = aMaxSamples;
 
-    if (dU > gp::Resolution() && dV > gp::Resolution()) {
+    if (dU > Precision::Confusion() && dV > Precision::Confusion()) {
       if (Max(dU, dV) > Min(dU, dV) * aTresh)
       {
         aMinSamples = 10;
@@ -190,12 +191,7 @@ IntCurvesFace_Intersector::IntCurvesFace_Intersector(const TopoDS_Face& Face,
       }
     }
     else {
-      if (dU < gp::Resolution()) {
-        nbsu = 1;
-      }
-      if (dV < gp::Resolution()) {
-        nbsv = 1;
-      }
+      return; // surface has no extension along one of directions
     }
 
     Standard_Integer NbUOnS = Hsurface->NbUIntervals(GeomAbs_C2);
@@ -215,6 +211,7 @@ IntCurvesFace_Intersector::IntCurvesFace_Intersector(const TopoDS_Face& Face,
         new IntCurveSurface_ThePolyhedronOfHInter(Hsurface,nbsu,nbsv,U0,V0,U1,V1);
     }
   }
+  myReady = Standard_True;
 }
 //=======================================================================
 //function : InternalCall
@@ -350,6 +347,11 @@ void IntCurvesFace_Intersector::Perform(const gp_Lin& L,
 					const Standard_Real ParMin,
 					const Standard_Real ParMax)
 { 
+  done = Standard_False;
+  if (!myReady)
+  {
+    return;
+  }
   done = Standard_True;
   SeqPnt.Clear();
   mySeqState.Clear();
@@ -428,6 +430,11 @@ void IntCurvesFace_Intersector::Perform(const Handle(Adaptor3d_HCurve)& HCu,
 					const Standard_Real ParMin,
 					const Standard_Real ParMax) 
 { 
+  done = Standard_False;
+  if (!myReady)
+  {
+    return;
+  }
   done = Standard_True;
   SeqPnt.Clear();
   //  Modified by skv - Wed Sep  3 16:14:10 2003 OCC578 Begin
diff --git a/src/IntCurvesFace/IntCurvesFace_Intersector.hxx b/src/IntCurvesFace/IntCurvesFace_Intersector.hxx
index c5843541bf..245e5c3af0 100644
--- a/src/IntCurvesFace/IntCurvesFace_Intersector.hxx
+++ b/src/IntCurvesFace/IntCurvesFace_Intersector.hxx
@@ -160,6 +160,7 @@ private:
   IntCurveSurface_SequenceOfPnt SeqPnt;
   TColStd_SequenceOfInteger mySeqState;
   Standard_Boolean done;
+  Standard_Boolean myReady;
   Standard_Integer nbpnt;
   TopoDS_Face face;
   Standard_Address PtrOnPolyhedron;
diff --git a/tests/bugs/fclasses/bug7287_2 b/tests/bugs/fclasses/bug7287_2
index a21bc81fd1..bb2c5a901e 100755
--- a/tests/bugs/fclasses/bug7287_2
+++ b/tests/bugs/fclasses/bug7287_2
@@ -26,5 +26,5 @@ for {set i 1} {${i} <= ${NCycles}} {incr i } {
     bop b1 b2
     bopcut r
     lappend listmem [meminfo h]
-    checktrend $listmem 0 100 "Memory leak detected"
 }
+checktrend $listmem 0 100 "Memory leak detected"
diff --git a/tests/bugs/step/bug30790 b/tests/bugs/step/bug30790
new file mode 100644
index 0000000000..bfb71be243
--- /dev/null
+++ b/tests/bugs/step/bug30790
@@ -0,0 +1,13 @@
+puts "========================"
+puts "0030790: Crash when loading specific step file"
+puts "========================"
+
+puts "TODO 30790 ALL: Faulty shapes in variables faulty_1 to"
+
+stepread [locate_data_file bug30790.step] a *
+
+tpcompound result
+
+checkshape result
+
+checkview -display result -2d -path ${imagedir}/${test_image}.png
diff --git a/tests/de/step_3/D9 b/tests/de/step_3/D9
index 0f3fbbfec3..6bed663c23 100755
--- a/tests/de/step_3/D9
+++ b/tests/de/step_3/D9
@@ -1,7 +1,7 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL:  Update of 3D-Parameters has failed" 
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
-
+puts "TODO CR23096 ALL: Error : 2 differences with reference data found"
 
 set filename 53921163S0.stp