diff options
| author | Trond Kjernåsen <trond@trolltech.com> | 2009-11-17 14:37:25 (GMT) |
|---|---|---|
| committer | Trond Kjernåsen <trond@trolltech.com> | 2009-11-17 14:37:25 (GMT) |
| commit | cfa2c8edab18e810749ad7df29c0b3b4f83f7140 (patch) | |
| tree | 02ef65dc18b653a0736908fe03f78288da5ad7b8 /src/gui/image/qpixmap_mac.cpp | |
| parent | 4297b85a83408f86f2bd4df0f3b7bc98bf900fbe (diff) | |
| download | Qt-cfa2c8edab18e810749ad7df29c0b3b4f83f7140.zip Qt-cfa2c8edab18e810749ad7df29c0b3b4f83f7140.tar.gz Qt-cfa2c8edab18e810749ad7df29c0b3b4f83f7140.tar.bz2 | |
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
Diffstat (limited to 'src/gui/image/qpixmap_mac.cpp')
| -rw-r--r-- | src/gui/image/qpixmap_mac.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/image/qpixmap_mac.cpp b/src/gui/image/qpixmap_mac.cpp index 6175931..365c271 100644 --- a/src/gui/image/qpixmap_mac.cpp +++ b/src/gui/image/qpixmap_mac.cpp @@ -160,8 +160,8 @@ QSet<QMacPixmapData*> QMacPixmapData::validDataPointers; QMacPixmapData::QMacPixmapData(PixelType type) : QPixmapData(type, MacClass), has_alpha(0), has_mask(0), - uninit(true), pixels(0), pixelsToFree(0), bytesPerRow(0), - cg_data(0), cg_dataBeingReleased(0), cg_mask(0), + uninit(true), pixels(0), pixelsSize(0), pixelsToFree(0), + bytesPerRow(0), cg_data(0), cg_dataBeingReleased(0), cg_mask(0), pengine(0) { } @@ -637,8 +637,9 @@ void QMacPixmapData::macCreatePixels() } if (pixels) - memcpy(base_pixels, pixels, numBytes); + memcpy(base_pixels, pixels, pixelsSize); pixels = base_pixels; + pixelsSize = numBytes; } #if 0 |