Bug 0020233: Infinite loop in boolean operation with a sphere with r=0

diff --git a/src/GEOMImpl/GEOMImpl_CircleDriver.cxx b/src/GEOMImpl/GEOMImpl_CircleDriver.cxx
index 2edcc5c1b4263ae9c3a79f1c71daf661aa58ae2e..6623453818ecb7055a7eec3a002db967739da4d7 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_CircleDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_CircleDriver.cxx
@@ -111,8 +111,13 @@ Standard_Integer GEOMImpl_CircleDriver::Execute(TFunction_Logbook& log) const
     }
     // Axes
     gp_Ax2 anAxes (aP, aV);
+    // Radius
+    double anR = aCI.GetRadius();
+    char aMsg[] = "Circle creation aborted: radius value less than 1e-07 is not acceptable";
+    if (anR < Precision::Confusion())
+      Standard_ConstructionError::Raise(aMsg);
     // Circle
-    gp_Circ aCirc (anAxes, aCI.GetRadius());
+    gp_Circ aCirc (anAxes, anR);
     aShape = BRepBuilderAPI_MakeEdge(aCirc).Edge();
   }
   else if (aType == CIRCLE_CENTER_TWO_PNT) {

diff --git a/src/GEOMImpl/GEOMImpl_SphereDriver.cxx b/src/GEOMImpl/GEOMImpl_SphereDriver.cxx
index 9bc4f0e8dbd7fedc519f86f70b60c10ae4c2286f..335f8c7c5ef49bdcf601230239a06d6c0929da96 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_SphereDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_SphereDriver.cxx
@@ -18,7 +18,7 @@
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
+
 #include <Standard_Stream.hxx>
 
 #include <GEOMImpl_SphereDriver.hxx>
@@ -67,16 +67,27 @@ Standard_Integer GEOMImpl_SphereDriver::Execute(TFunction_Logbook& log) const
 
   TopoDS_Shape aShape;
 
+  char aMsg[] = "Sphere creation aborted: radius value less than 1e-07 is not acceptable";
+
   if (aType == SPHERE_R) {
-    aShape = BRepPrimAPI_MakeSphere(aCI.GetR()).Shape();
+    double anR = aCI.GetR();
+    if (anR < Precision::Confusion())
+      Standard_ConstructionError::Raise(aMsg);
+
+    aShape = BRepPrimAPI_MakeSphere(anR).Shape();
   }
   else if (aType == SPHERE_PNT_R) {
+    double anR = aCI.GetR();
+    if (anR < Precision::Confusion())
+      Standard_ConstructionError::Raise(aMsg);
+
     Handle(GEOM_Function) aRefPoint  = aCI.GetPoint();
     TopoDS_Shape aShapePnt = aRefPoint->GetValue();
-    if (aShapePnt.ShapeType() == TopAbs_VERTEX) {
-      gp_Pnt aP = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt));
-      aShape = BRepPrimAPI_MakeSphere(aP, aCI.GetR()).Shape();
-    }
+    if (aShapePnt.ShapeType() != TopAbs_VERTEX)
+      Standard_ConstructionError::Raise("Invalid shape given for sphere center: it must be a point");
+    gp_Pnt aP = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt));
+
+    aShape = BRepPrimAPI_MakeSphere(aP, anR).Shape();
   }
   else {
   }