1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt_pixmapFromWinHICON(): Fix crash and leak in case of Win32 API fails.

Browse Source 
Release the DC and move alpha-checking into separate function
to prevent it from using invalid width/height.

Task-number: QTBUG-48732
Change-Id: Iaf7cfa89b0f702f5012b0451d24a9e887d832c59
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
This commit is contained in:
Friedemann Kleint 2015-10-13 13:55:08 +02:00
parent bc00f3c228
commit 957fb9fb82
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/gui/image/qpixmap_win.cpp
View File

@ -345,9 +345,22 @@ static QImage qt_imageFromWinIconHBITMAP(HDC hdc, HBITMAP bitmap, int w, int h)
return image; return image;
} }
static inline bool hasAlpha(const QImage &image)
{
const int w = image.width();
const int h = image.height();
for (int y = 0; y < h; ++y) {
const QRgb *scanLine = reinterpret_cast<const QRgb *>(image.scanLine(y));
for (int x = 0; x < w; ++x) {
if (qAlpha(scanLine[x]) != 0)
return true;
}
}
return false;
}
Q_GUI_EXPORT QPixmap qt_pixmapFromWinHICON(HICON icon) Q_GUI_EXPORT QPixmap qt_pixmapFromWinHICON(HICON icon)
{ {
bool foundAlpha = false;
HDC screenDevice = GetDC(0); HDC screenDevice = GetDC(0);
HDC hdc = CreateCompatibleDC(screenDevice); HDC hdc = CreateCompatibleDC(screenDevice);
ReleaseDC(0, screenDevice); ReleaseDC(0, screenDevice);
@ -356,6 +369,7 @@ Q_GUI_EXPORT QPixmap qt_pixmapFromWinHICON(HICON icon)
const bool result = GetIconInfo(icon, &iconinfo); //x and y Hotspot describes the icon center const bool result = GetIconInfo(icon, &iconinfo); //x and y Hotspot describes the icon center
if (!result) { if (!result) {
qErrnoWarning("QPixmap::fromWinHICON(), failed to GetIconInfo()"); qErrnoWarning("QPixmap::fromWinHICON(), failed to GetIconInfo()");
DeleteDC(hdc);
return QPixmap(); return QPixmap();
} }
@ -371,17 +385,7 @@ Q_GUI_EXPORT QPixmap qt_pixmapFromWinHICON(HICON icon)
DrawIconEx( hdc, 0, 0, icon, iconinfo.xHotspot * 2, iconinfo.yHotspot * 2, 0, 0, DI_NORMAL); DrawIconEx( hdc, 0, 0, icon, iconinfo.xHotspot * 2, iconinfo.yHotspot * 2, 0, 0, DI_NORMAL);
QImage image = qt_imageFromWinIconHBITMAP(hdc, winBitmap, w, h); QImage image = qt_imageFromWinIconHBITMAP(hdc, winBitmap, w, h);
for (int y = 0 ; y < h && !foundAlpha ; y++) { if (!image.isNull() && !hasAlpha(image)) { //If no alpha was found, we use the mask to set alpha values
const QRgb *scanLine= reinterpret_cast<const QRgb *>(image.scanLine(y));
for (int x = 0; x < w ; x++) {
if (qAlpha(scanLine[x]) != 0) {
foundAlpha = true;
break;
}
}
}
if (!foundAlpha) {
//If no alpha was found, we use the mask to set alpha values
DrawIconEx( hdc, 0, 0, icon, w, h, 0, 0, DI_MASK); DrawIconEx( hdc, 0, 0, icon, w, h, 0, 0, DI_MASK);
const QImage mask = qt_imageFromWinIconHBITMAP(hdc, winBitmap, w, h); const QImage mask = qt_imageFromWinIconHBITMAP(hdc, winBitmap, w, h);