From 0c5a6d479bb648fefbdf229cc99712462d71798a Mon Sep 17 00:00:00 2001
From: msv <msv@opencascade.com>
Date: Mon, 26 Dec 2016 15:31:14 +0300
Subject: [PATCH] 0028283: The command bopcheck crashes on the given shape

BOPAlgo_CheckerSI crashed due to building of pcurve for an edge not lying on surface. The fix avoids building of pcurves in this algorithm.
The new flag has been added in BOPAlgo_PaveFiller class (method SetAvoidBuildPCurve). It tells whether to avoid building pcurves. It is worth to set if the result is not used to create splits of faces, as in example with BOPAlgo_CheckerSI.
---
 src/BOPAlgo/BOPAlgo_CheckerSI.cxx    |  1 +
 src/BOPAlgo/BOPAlgo_PaveFiller.cxx   | 22 ++++++++++++----------
 src/BOPAlgo/BOPAlgo_PaveFiller.hxx   | 11 +++++++++++
 src/BOPAlgo/BOPAlgo_PaveFiller_7.cxx |  3 +++
 tests/bugs/modalg_6/bug28283         | 16 ++++++++++++++++
 5 files changed, 43 insertions(+), 10 deletions(-)
 create mode 100644 tests/bugs/modalg_6/bug28283

diff --git a/src/BOPAlgo/BOPAlgo_CheckerSI.cxx b/src/BOPAlgo/BOPAlgo_CheckerSI.cxx
index cad8fc099a..d038073a48 100644
--- a/src/BOPAlgo/BOPAlgo_CheckerSI.cxx
+++ b/src/BOPAlgo/BOPAlgo_CheckerSI.cxx
@@ -48,6 +48,7 @@ BOPAlgo_CheckerSI::BOPAlgo_CheckerSI()
 {
   myLevelOfCheck=BOPDS_DS::NbInterfTypes()-1;
   myNonDestructive=Standard_True;
+  SetAvoidBuildPCurve(Standard_True);
 }
 //=======================================================================
 //function : ~
diff --git a/src/BOPAlgo/BOPAlgo_PaveFiller.cxx b/src/BOPAlgo/BOPAlgo_PaveFiller.cxx
index 247a5b87be..c3247e4466 100644
--- a/src/BOPAlgo/BOPAlgo_PaveFiller.cxx
+++ b/src/BOPAlgo/BOPAlgo_PaveFiller.cxx
@@ -39,11 +39,12 @@ BOPAlgo_PaveFiller::BOPAlgo_PaveFiller()
 :
   BOPAlgo_Algo()
 {
-  myDS=NULL;
-  myIterator=NULL;
-  myNonDestructive=Standard_False;
-  myIsPrimary=Standard_True;
-  myGlue=BOPAlgo_GlueOff;
+  myDS = NULL;
+  myIterator = NULL;
+  myNonDestructive = Standard_False;
+  myIsPrimary = Standard_True;
+  myAvoidBuildPCurve = Standard_False;
+  myGlue = BOPAlgo_GlueOff;
 }
 //=======================================================================
 //function : 
@@ -54,11 +55,12 @@ BOPAlgo_PaveFiller::BOPAlgo_PaveFiller
 :
   BOPAlgo_Algo(theAllocator)
 {
-  myDS=NULL;
-  myIterator=NULL;
-  myNonDestructive=Standard_False;
-  myIsPrimary=Standard_True;
-  myGlue=BOPAlgo_GlueOff;
+  myDS = NULL;
+  myIterator = NULL;
+  myNonDestructive = Standard_False;
+  myIsPrimary = Standard_True;
+  myAvoidBuildPCurve = Standard_False;
+  myGlue = BOPAlgo_GlueOff;
 }
 //=======================================================================
 //function : ~
diff --git a/src/BOPAlgo/BOPAlgo_PaveFiller.hxx b/src/BOPAlgo/BOPAlgo_PaveFiller.hxx
index 70bcba8f4b..1d66c94f69 100644
--- a/src/BOPAlgo/BOPAlgo_PaveFiller.hxx
+++ b/src/BOPAlgo/BOPAlgo_PaveFiller.hxx
@@ -108,7 +108,17 @@ public:
   //! Returns the glue option of the algorithm
   Standard_EXPORT BOPAlgo_GlueEnum Glue() const;
 
+  //! Sets the flag to avoid building of p-curves of edges on faces
+  void SetAvoidBuildPCurve(const Standard_Boolean theValue)
+  {
+    myAvoidBuildPCurve = theValue;
+  }
 
+  //! Returns the flag to avoid building of p-curves of edges on faces
+  Standard_Boolean IsAvoidBuildPCurve() const
+  {
+    return myAvoidBuildPCurve;
+  }
 
 protected:
 
@@ -405,6 +415,7 @@ protected:
   BOPAlgo_SectionAttribute mySectionAttribute;
   Standard_Boolean myNonDestructive;
   Standard_Boolean myIsPrimary;
+  Standard_Boolean myAvoidBuildPCurve;
   BOPAlgo_GlueEnum myGlue;
 
 
diff --git a/src/BOPAlgo/BOPAlgo_PaveFiller_7.cxx b/src/BOPAlgo/BOPAlgo_PaveFiller_7.cxx
index f2e74766cf..99a88d6a82 100644
--- a/src/BOPAlgo/BOPAlgo_PaveFiller_7.cxx
+++ b/src/BOPAlgo/BOPAlgo_PaveFiller_7.cxx
@@ -525,6 +525,9 @@ Standard_Integer BOPAlgo_PaveFiller::SplitEdge(const Standard_Integer nE,
 //=======================================================================
 void BOPAlgo_PaveFiller::MakePCurves()
 {
+  if (myAvoidBuildPCurve ||
+      (!mySectionAttribute.PCurveOnS1() && !mySectionAttribute.PCurveOnS2()))
+    return;
   Standard_Boolean bHasPC;
   Standard_Integer i, nF1, nF2, aNbC, k, nE, aNbFF, aNbFI, nEx;
   Standard_Integer j, aNbPBIn, aNbPBOn;
diff --git a/tests/bugs/modalg_6/bug28283 b/tests/bugs/modalg_6/bug28283
new file mode 100644
index 0000000000..f800db33e6
--- /dev/null
+++ b/tests/bugs/modalg_6/bug28283
@@ -0,0 +1,16 @@
+puts "========"
+puts "OCC28283"
+puts "========"
+puts ""
+#################################################
+# The command bopcheck crashes on the given shape
+#################################################
+
+restore [locate_data_file bug28283_shell.brep] a
+
+bfuzzyvalue 1
+if [catch {bopcheck a}] {
+  puts "Error: bopcheck crash"
+} else {
+  puts "OK: bopcheck passed"
+}