Fixed a crash on Mac in QPixmap when loading pixmaps of different sizes.

The size of the original pixmap data block wasn't retained, which would
result in out-of-bound reads in the memcpy() call.

Task-number: QTBUG-5070
Reviewed-by: Kim

1 files changed, 1 insertions, 0 deletions

diff --git a/src/gui/image/qpixmap_mac_p.h b/src/gui/image/qpixmap_mac_p.h
index a3fb95f..45ab8e2 100644
--- a/src/gui/image/qpixmap_mac_p.h
+++ b/src/gui/image/qpixmap_mac_p.h
@@ -107,6 +107,7 @@ private:
            pixelsToFree later on instead of malloc'ing memory.
     */
     quint32 *pixels;
+    uint pixelsSize;
     quint32 *pixelsToFree;
     uint bytesPerRow;
     QRectF cg_mask_rect;