Changeset 698 for trunk/src

Timestamp:

Mar 17, 2010, 11:22:11 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Fixed crash in PMMERGE during resize & move of the top level window with the complex layout (caused by reading outside the bitmap data).

File:

• trunk/src/gui/painting/qwindowsurface_raster.cpp (modified) (7 diffs)

trunk/src/gui/painting/qwindowsurface_raster.cpp

@@ -212 +212 @@
 
 #if 0
-    qDebug() << "QRasterWindowSurface::flush:" << widget << "wps" << wps
-             << "br" << br;
+    qDebug() << "QRasterWindowSurface::flush:" << widget
+             << "wps" << qDebugFmtHex(wps) << "br" << br;
 #endif
 
@@ -225 +225 @@
     QImage img = d->image->image.mirrored();
 
+    br.translate(offset);
+
+    // make sure br doesn't exceed the backing storage size (it may happen
+    // during resize & move due to the different event order)
+    br = br.intersected(QRect(0, 0, img.width(), img.height()));
+
     QPoint wOffset = qt_qwidget_data(widget)->wrect.topLeft();
-    QRect wbr = br.translated(-wOffset);
-
-    br.translate(offset);
+    QRect wbr = br.translated(-offset - wOffset);
 
     BITMAPINFOHEADER2 bmh;
@@ -249 +253 @@
     qDebug() << "QRasterWindowSurface::flush:" << widget << "ptls"
              << ptls[0].x << ptls[0].y << ptls[1].x << ptls[1].y
-             << ptls[2].x << ptls[2].y << ptls[3].x << ptls[3].y;
+             << ptls[2].x << ptls[2].y << ptls[3].x << ptls[3].y
+             << "img.size" << img.size() << "img.bits" << img.bits();
 #endif
     GpiDrawBits(wps, (PVOID) img.bits(), (PBITMAPINFO2) &bmh, 4, ptls,
@@ -256 +261 @@
 #elif QT_BITMAP_MIRROR == 2
 
+    br.translate(offset);
+
+    // make sure br doesn't exceed the backing storage size (it may happen
+    // during resize & move due to the different event order)
+    br = br.intersected(QRect(0, 0, d->image->width(), d->image->height()));
+
     QPoint wOffset = qt_qwidget_data(widget)->wrect.topLeft();
-    QRect wbr = br.translated(-wOffset);
-
-    br.translate(offset);
+    QRect wbr = br.translated(-offset - wOffset);
 
     BITMAPINFOHEADER2 bmh;
@@ -277 +286 @@
     qDebug() << "QRasterWindowSurface::flush:" << widget << "ptls"
              << ptls[0].x << ptls[0].y << ptls[1].x << ptls[1].y
-             << ptls[2].x << ptls[2].y << ptls[3].x << ptls[3].y;
+             << ptls[2].x << ptls[2].y << ptls[3].x << ptls[3].y
+             << "img.size" << d->image->size() << "img.bits" << d->image->bits();
 #endif
 
@@ -289 +299 @@
 
     GpiEnableYInversion(wps, oldInversion);
+
+#ifndef QT_NO_DEBUG
+    // for debug flushing
+    const QImage img = d->image->image;
+#endif
 
 #elif QT_BITMAP_MIRROR == 3
@@ -310 +325 @@
     GpiSetDefaultViewMatrix(wps, 8, &m, TRANSFORM_REPLACE);
 
+    br.translate(offset);
+
+    // make sure br doesn't exceed the backing storage size (it may happen
+    // during resize & move due to the different event order)
+    br = br.intersected(QRect(0, 0, d->image->width(), d->image->height()));
+
     QPoint wOffset = qt_qwidget_data(widget)->wrect.topLeft();
-    QRect wbr = br.translated(-wOffset);
-
-    br.translate(offset);
+    QRect wbr = br.translated(-offset - wOffset);
 
     BITMAPINFOHEADER2 bmh;