Prevent crash from middle marker when a path or polyline has only one point.

(bzr r12343)

1 files changed, 4 insertions, 2 deletions

diff --git a/src/sp-shape.cpp b/src/sp-shape.cpp
index 4037b302c..be9f5388c 100644
--- a/src/sp-shape.cpp
+++ b/src/sp-shape.cpp
@@ -889,8 +889,8 @@ int SPShape::numberOfMarkers(int type)
     if (pathv.size() == 0) {
         return 0;
     }
-
     switch(type) {
+
         case SP_MARKER_LOC:
         {
             if ( this->_marker[SP_MARKER_LOC] ) {
@@ -914,7 +914,9 @@ int SPShape::numberOfMarkers(int type)
                 for(Geom::PathVector::const_iterator path_it = pathv.begin(); path_it != pathv.end(); ++path_it) {
                     n += path_it->size_default() + 1;
                 }
-                return n - 2; // minus the start and end marker.
+                n = (n > 1) ? (n - 2) : 0; // Minus the start and end marker, but never negative.
+                                           // A path or polyline may have only one point.
+                return n;
             } else {
                 return 0;
             }