diff options
| author | Prasanth Ullattil <prasanth.ullattil@nokia.com> | 2010-07-30 11:00:34 (GMT) |
|---|---|---|
| committer | Toby Tomkins <toby.tomkins@nokia.com> | 2010-08-02 01:20:37 (GMT) |
| commit | b0d3cbe8cdad8289ab49f6b8d9af2c83848ad59d (patch) | |
| tree | a46cb0c9c9ca41f5a97516cef23b192a59e1e5a4 /src/gui | |
| parent | b06e5859a9c001a1c8afa30b88362622aa2d852d (diff) | |
| download | Qt-b0d3cbe8cdad8289ab49f6b8d9af2c83848ad59d.zip Qt-b0d3cbe8cdad8289ab49f6b8d9af2c83848ad59d.tar.gz Qt-b0d3cbe8cdad8289ab49f6b8d9af2c83848ad59d.tar.bz2 | |
QFileDialog crashes when empty selectedFilter is set on Carbon.
We were making the wrong assumption that the selectedFilter string
will be valid always, when calling functions like getSaveFileName().
Task-number: QTBUG-12461
Reviewed-by: Denis
(cherry picked from commit fb47a99e1d0020e8dcc4cc4f9c188ccd2fd5ee3e)
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/dialogs/qfiledialog_mac.mm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/dialogs/qfiledialog_mac.mm b/src/gui/dialogs/qfiledialog_mac.mm index f1afaa9..64fc0ee 100644 --- a/src/gui/dialogs/qfiledialog_mac.mm +++ b/src/gui/dialogs/qfiledialog_mac.mm @@ -782,9 +782,11 @@ void QFileDialogPrivate::qt_mac_filedialog_event_proc(const NavEventCallbackMess const QtMacFilterName &fn = fileDialogPrivate->filterInfo.filters.at( fileDialogPrivate->filterInfo.currentSelection); QStringList reg = fn.regexp.split(QLatin1String(";"), QString::SkipEmptyParts); - QString r = reg.first(); - r = r.right(r.length()-1); // Strip the * - base += r; //"." + QString::number(s->menuType); + if (reg.count()) { + QString r = reg.first(); + r = r.right(r.length()-1); // Strip the * + base += r; //"." + QString::number(s->menuType); + } NavDialogSetSaveFileName(p->context, QCFString::toCFStringRef(base)); } #ifdef DEBUG_FILEDIALOG_FILTERS |