Skip to content

Commit 1484771

Browse files
committed
Fix native file dialog crash with invalid filter.
1 parent 5dd7696 commit 1484771

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

platform/linuxbsd/freedesktop_portal_desktop.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ Error FreeDesktopPortalDesktop::file_dialog_show(DisplayServer::WindowID p_windo
670670
Vector<String> tokens = p_filters[i].split(";");
671671
if (tokens.size() >= 1) {
672672
String flt = tokens[0].strip_edges();
673-
String mime = (tokens.size() >= 2) ? tokens[2].strip_edges() : String();
673+
String mime = (tokens.size() >= 3) ? tokens[2].strip_edges() : String();
674674
if (!flt.is_empty() || !mime.is_empty()) {
675675
if (tokens.size() >= 2) {
676676
if (flt == "*.*") {

platform/macos/godot_open_save_delegate.mm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ - (void)makeAccessoryView:(NSSavePanel *)p_panel filters:(const Vector<String> &
119119
Vector<String> tokens = p_filters[i].split(";");
120120
if (tokens.size() >= 1) {
121121
String flt = tokens[0].strip_edges();
122-
String mime = (tokens.size() >= 2) ? tokens[2].strip_edges() : String();
122+
String mime = (tokens.size() >= 3) ? tokens[2].strip_edges() : String();
123123
int filter_slice_count = flt.get_slice_count(",");
124124

125125
NSMutableArray *type_filters = [[NSMutableArray alloc] init];
@@ -173,7 +173,7 @@ - (void)makeAccessoryView:(NSSavePanel *)p_panel filters:(const Vector<String> &
173173
Vector<String> tokens = p_filters[0].split(";");
174174
if (tokens.size() >= 1) {
175175
String flt = tokens[0].strip_edges();
176-
String mime = (tokens.size() >= 2) ? tokens[2] : String();
176+
String mime = (tokens.size() >= 3) ? tokens[2] : String();
177177
int filter_slice_count = flt.get_slice_count(",");
178178

179179
NSMutableArray *type_filters = [[NSMutableArray alloc] init];

0 commit comments

Comments
 (0)