diff options
| author | Kevin Funk <kevin.funk@kdab.com> | 2017-02-15 13:10:04 +0100 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2017-02-15 12:46:30 +0000 |
| commit | e0c43fb046795ca6d64d621b1467905abc41186d (patch) | |
| tree | b453901976aebe3d4720c2f972a2a3bb4e7841e2 /src/widgets/dialogs/qfiledialog.cpp | |
| parent | 9e888e633b6cc1b92eb3923daca23e32bedad656 (diff) | |
QFileDialog: Protect against nullptr dereference
When the QFileDialog receives a language change event, and native
dialogs are used, this code path dereference a nullptr in the qFileDialogUi member.
Protect by checking the return value of QFileDialogPrivate::usingWidgets() as
done in other places deferencing qFileDialogUi.
Fixes a crash in GammaRay
Change-Id: I3e9eb81c75d9fc983519a58c5ec06e316ac80263
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/widgets/dialogs/qfiledialog.cpp')
| -rw-r--r-- | src/widgets/dialogs/qfiledialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index 74875faf21..5892ec6a75 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -656,7 +656,7 @@ void QFileDialogPrivate::retranslateStrings() /* WIDGETS */ if (options->useDefaultNameFilters()) q->setNameFilter(QFileDialogOptions::defaultNameFilterString()); - if (nativeDialogInUse) + if (!usingWidgets()) return; QList<QAction*> actions = qFileDialogUi->treeView->header()->actions(); |