issue #2816: Trimming tool crashes

FreeCAD · Jan 23, 2017 · 43e8c21 · 43e8c21
1 parent 417f074
commit 43e8c21
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/Mod/Sketcher/App/PropertyConstraintList.h b/src/Mod/Sketcher/App/PropertyConstraintList.h
@@ -86,7 +86,11 @@ class SketcherExport PropertyConstraintList : public App::PropertyLists
     */
     void setValues(const std::vector<Constraint*>&);
 
-    /// index operator
+    /*!
+     Index operator
+     \note If the geometry is invalid then the index operator
+           returns null. This must be checked by the caller.
+    */
     const Constraint *operator[] (const int idx) const {
         return invalidGeometry ? 0 : _lValueList[idx];
     }
@@ -112,7 +116,6 @@ class SketcherExport PropertyConstraintList : public App::PropertyLists
     void acceptGeometry(const std::vector<Part::Geometry *> &GeoList);
     void checkGeometry(const std::vector<Part::Geometry *> &GeoList);
     bool scanGeometry(const std::vector<Part::Geometry *> &GeoList) const;
-    bool isGeometryInvalid(){return invalidGeometry;}
 
     /// Return status of geometry for better error reporting
     bool hasInvalidGeometry() const { return invalidGeometry; }

diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstrains.cpp b/src/Mod/Sketcher/Gui/TaskSketcherConstrains.cpp
@@ -102,6 +102,12 @@ class ConstraintItem : public QListWidgetItem
 
         const Sketcher::Constraint * constraint = sketch->Constraints[ConstraintNbr];
 
+        // it can happen that the geometry of the sketch is tmp. invalid and thus
+        // the index operator returns null.
+        if (!constraint) {
+            return QVariant();
+        }
+
         if (role == Qt::EditRole) {
             if (value.isValid())
                 return value;