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

QWizard: Fix null pointer dereference if no pixmap was set

Browse Source 
The pixmap may be set in QWizardPrivate::updateLayout() if there's a
side widget or a watermark. If neither exists, then no pixmap is set and
this would cause a crash.

Task-number: QTBUG-61423
Change-Id: Ia53158e207a94bf49489fffd14c80dd93415dd0f
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Thiago Macieira 2017-06-14 10:41:42 -07:00
parent 3509626128
commit c7ea60d1ab
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/dialogs/qwizard.cpp
View File

@ -450,7 +450,7 @@ public:
} }
QSize minimumSizeHint() const Q_DECL_OVERRIDE { QSize minimumSizeHint() const Q_DECL_OVERRIDE {
if (!pixmap() && !pixmap()->isNull()) if (pixmap() && !pixmap()->isNull())
return pixmap()->size(); return pixmap()->size();
return QFrame::minimumSizeHint(); return QFrame::minimumSizeHint();
} }