+ fixes #1690: sketch.getPoint crashes FreeCAD if the point does not …

…exist
FreeCAD · Aug 16, 2014 · 8808b82 · 8808b82
1 parent 92cb03b
commit 8808b82
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/Mod/Sketcher/App/SketchObjectPyImp.cpp b/src/Mod/Sketcher/App/SketchObjectPyImp.cpp
@@ -357,7 +357,18 @@ PyObject* SketchObjectPy::getPoint(PyObject *args)
     if (!PyArg_ParseTuple(args, "ii", &GeoId, &PointType))
         return 0;
 
-    return new Base::VectorPy(new Base::Vector3d(this->getSketchObjectPtr()->getPoint(GeoId,(Sketcher::PointPos)PointType)));
+    if (PointType < 0 || PointType > 3) {
+        PyErr_SetString(PyExc_ValueError, "Invalid point type");
+        return 0;
+    }
+
+    SketchObject* obj = this->getSketchObjectPtr();
+    if (GeoId > obj->getHighestCurveIndex() || -GeoId > obj->getExternalGeometryCount()) {
+        PyErr_SetString(PyExc_ValueError, "Invalid geometry Id");
+        return 0;
+    }
+
+    return new Base::VectorPy(new Base::Vector3d(obj->getPoint(GeoId,(Sketcher::PointPos)PointType)));
 }
 
 PyObject* SketchObjectPy::getAxis(PyObject *args)