Fixed segmentation fault caused by empty clip.

Make sure not to use the broken QRect constructor, and do an early check
on whether the clip rect is empty in QRasterizer::rasterizeLine().

Task-number: 254105
Reviewed-by: Trond

2 files changed, 2 insertions, 2 deletions

diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 743c4b8be7..84af880732 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -3956,7 +3956,7 @@ void QRasterPaintEnginePrivate::initializeRasterizer(QSpanData *data)
     const QClipData *c = clip();
     if (c) {
         const QRect r(QPoint(c->xmin, c->ymin),
-                      QPoint(c->xmax, c->ymax));
+                      QSize(c->xmax - c->xmin, c->ymax - c->ymin));
         clipRect = clipRect.intersected(r);
         blend = data->blend;
     } else {
diff --git a/src/gui/painting/qrasterizer.cpp b/src/gui/painting/qrasterizer.cpp
index 629b38ef0b..58e4b4e3c7 100644
--- a/src/gui/painting/qrasterizer.cpp
+++ b/src/gui/painting/qrasterizer.cpp
@@ -703,7 +703,7 @@ static inline qreal qRoundF(qreal v)
 
 void QRasterizer::rasterizeLine(const QPointF &a, const QPointF &b, qreal width, bool squareCap)
 {
-    if (a == b || width == 0)
+    if (a == b || width == 0 || d->clipRect.isEmpty())
         return;
 
     QPointF pa = a;