AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a crash of accessing deleted paintengine

Browse Source 
When painting to QPixmap with QBlitterPaintEngine and dfb
PaintEngine have PaintDevice (pdev) as QImage. Painter code
uses PaintDevice::paintEngine() to refer to paintEngine.
This will became dangling pointer since QDirectFbBlitter::doLock()
will delete QImage. Instead return QPixmap as PaintDevice.

Change-Id: Idfac919b6438a82b412020e441e0a102e4a2a052
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
This commit is contained in:
Michal Klocek 2014-02-20 16:50:15 +01:00 committed by The Qt Project
parent 45f264b682
commit 72fe9f1d0d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/painting/qpaintengine_blitter.cpp
View File

@ -494,11 +494,12 @@ void QBlitterPaintEngine::clipEnabledChanged()
bool QBlitterPaintEngine::begin(QPaintDevice *pdev) bool QBlitterPaintEngine::begin(QPaintDevice *pdev)
{ {
Q_D(QBlitterPaintEngine);
bool ok = QRasterPaintEngine::begin(pdev); bool ok = QRasterPaintEngine::begin(pdev);
#ifdef QT_BLITTER_RASTEROVERLAY #ifdef QT_BLITTER_RASTEROVERLAY
Q_D(QBlitterPaintEngine);
d->pmData->unmergeOverlay(); d->pmData->unmergeOverlay();
#endif #endif
d->pdev = pdev;
return ok; return ok;
} }