Fixed crash when vectorpath was polygonal only in raster::stroke()

Polygonal vector paths may have types==null, in which case this
would have crashed.

Reviewed-by: Eskil

1 files changed, 16 insertions, 9 deletions

diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 51764441ae..069c350cb6 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -1687,17 +1687,24 @@ void QRasterPaintEngine::stroke(const QVectorPath &path, const QPen &pen)
         int count = path.elementCount();
         QPointF *points = (QPointF *) path.points();
         const QPainterPath::ElementType *types = path.elements();
-        int first = 0;
-        int last;
-        while (first < count) {
-            while (first < count && types[first] != QPainterPath::MoveToElement) ++first;
-            last = first + 1;
-            while (last < count && types[last] == QPainterPath::LineToElement) ++last;
-            strokePolygonCosmetic(points + first, last - first,
-                                  path.hasImplicitClose() && last == count // only close last one..
+        if (types) {
+            int first = 0;
+            int last;
+            while (first < count) {
+                while (first < count && types[first] != QPainterPath::MoveToElement) ++first;
+                last = first + 1;
+                while (last < count && types[last] == QPainterPath::LineToElement) ++last;
+                strokePolygonCosmetic(points + first, last - first,
+                                      path.hasImplicitClose() && last == count // only close last one..
+                                      ? WindingMode
+                                      : PolylineMode);
+                first = last;
+            }
+        } else {
+            strokePolygonCosmetic(points, count,
+                                  path.hasImplicitClose()
                                   ? WindingMode
                                   : PolylineMode);
-            first = last;
         }
 
     } else if (s->flags.non_complex_pen && path.shape() == QVectorPath::LinesHint) {