prevent node-occ to crash when building cones and tori with invalid arguments.

Author: erossignon

src/Edge.cc

@@ -73,7 +73,7 @@ int Edge::createLine(Vertex *start, Vertex *end)
     this->setShape(shape);
 
   }
-  CATCH_AND_RETHROW("Failed to create line");
+  CATCH_AND_RETHROW_NO_RETURN("Failed to create line");
 
   return 1;
 }
@@ -97,7 +97,7 @@ int Edge::createArc(Vertex *start, Vertex *end, const gp_Pnt& center)
     this->setShape(BRepBuilderAPI_MakeEdge(arc, start->vertex(), end->vertex()));
 
   }
-  CATCH_AND_RETHROW("Failed to create arc");
+  CATCH_AND_RETHROW_NO_RETURN("Failed to create arc");
   return 1;
 }
 
@@ -110,7 +110,7 @@ int Edge::createArc3P(Vertex *start, Vertex *end, const gp_Pnt& aPoint)
     GC_MakeArcOfCircle arc(aP1, aP2, aP3);
     this->setShape(BRepBuilderAPI_MakeEdge(arc.Value(), start->vertex(), end->vertex()));
   }
-  CATCH_AND_RETHROW("Failed to create arc");
+  CATCH_AND_RETHROW_NO_RETURN("Failed to create arc");
   return 1;
 }
 
@@ -128,7 +128,7 @@ int Edge::createCircle(const gp_Pnt& center, const gp_Dir& normal, double radius
     this->setShape(BRepBuilderAPI_MakeEdge(circle));
 
   }
-  CATCH_AND_RETHROW("Failed to create circle");
+  CATCH_AND_RETHROW_NO_RETURN("Failed to create circle");
   return 1;
 }
 

src/Face.cc

@@ -123,7 +123,7 @@ bool Face::buildFace(std::vector<Wire*>& wires)
     }
 
   }
-  CATCH_AND_RETHROW("Failed to create a face");
+  CATCH_AND_RETHROW_NO_RETURN("Failed to create a face");
   return true;
 }
 
@@ -200,7 +200,7 @@ v8::Handle<v8::Object> Face::createMesh(double factor, double angle, bool qualit
     mesh->extractFaceMesh(this->face(), qualityNormals);
     mesh->optimize();
 
-  } CATCH_AND_RETHROW("Failed to mesh solid ");
+  } CATCH_AND_RETHROW_NO_RETURN("Failed to mesh solid ");
   return scope.Escape(theMesh);
 }
 

src/NodeV8.h

@@ -161,10 +161,20 @@ inline const char* ToCString(const v8::String::Utf8Value& value)
   catch(Standard_Failure& ) {                                   \
     Handle_Standard_Failure e = Standard_Failure::Caught();     \
     Standard_CString msg = e->GetMessageString();               \
-    std::cerr << "C++ exception in OCC "<< msg << std::endl;                              \
+    std::cerr << "C++ exception in OCC "<< msg << " " << message << std::endl;                              \
     if (msg == NULL || strlen(msg) < 1) {                       \
       msg = message;                                            \
     }                                                           \
-     Nan::ThrowError(msg);                                \
+     Nan::ThrowError(msg);                                      \
   }                                                             \
 
+#define CATCH_AND_RETHROW2(message)                              \
+  catch(Standard_Failure& ) {                                   \
+     info.GetReturnValue().Set(v8::Local<v8::Object>());               \
+     return Nan::ThrowError("");                                   \
+  }
+
+#define CATCH_AND_RETHROW_NO_RETURN(message)                    \
+  catch(Standard_Failure& ) {                                   \
+     Nan::ThrowError("");                                       \
+  }