diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-06-14 10:41:42 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-07-07 07:22:01 +0000 |
| commit | c7ea60d1abd65d5c85fc5e690a28935c9b4a2dec (patch) | |
| tree | 0b2a5a947c09063b5b51c996b1a489ffc0e72dc1 /src | |
| parent | 35096261282bfb2d66373d290dfa35b993158bb8 (diff) | |
QWizard: Fix null pointer dereference if no pixmap was set
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/dialogs/qwizard.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index 432b6f1879..4d89cd9936 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -450,7 +450,7 @@ public: } QSize minimumSizeHint() const Q_DECL_OVERRIDE { - if (!pixmap() && !pixmap()->isNull()) + if (pixmap() && !pixmap()->isNull()) return pixmap()->size(); return QFrame::minimumSizeHint(); } |