seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #107197 from bruvzg/fd_cr

Browse Source 
Fix native file dialog crash with invalid filter.
This commit is contained in:
Rémi Verschelde
2025-06-06 17:38:13 +02:00
parent 9786857bd9 1484771f26
commit 0c5b14ed6c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/linuxbsd/freedesktop_portal_desktop.cpp
View File

@ -670,7 +670,7 @@ Error FreeDesktopPortalDesktop::file_dialog_show(DisplayServer::WindowID p_windo
Vector<String> tokens = p_filters[i].split(";");
if (tokens.size() >= 1) {
String flt = tokens[0].strip_edges();
String mime = (tokens.size() >= 2) ? tokens[2].strip_edges() : String();
String mime = (tokens.size() >= 3) ? tokens[2].strip_edges() : String();
if (!flt.is_empty() || !mime.is_empty()) {
if (tokens.size() >= 2) {
if (flt == "*.*") {

4
platform/macos/godot_open_save_delegate.mm
View File

@ -119,7 +119,7 @@
Vector<String> tokens = p_filters[i].split(";");
if (tokens.size() >= 1) {
String flt = tokens[0].strip_edges();
String mime = (tokens.size() >= 2) ? tokens[2].strip_edges() : String();
String mime = (tokens.size() >= 3) ? tokens[2].strip_edges() : String();
int filter_slice_count = flt.get_slice_count(",");
NSMutableArray *type_filters = [[NSMutableArray alloc] init];
@ -173,7 +173,7 @@
Vector<String> tokens = p_filters[0].split(";");
if (tokens.size() >= 1) {
String flt = tokens[0].strip_edges();
String mime = (tokens.size() >= 2) ? tokens[2] : String();
String mime = (tokens.size() >= 3) ? tokens[2] : String();
int filter_slice_count = flt.get_slice_count(",");
NSMutableArray *type_filters = [[NSMutableArray alloc] init];