deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-16 10:40:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added defensive path validation in gtkutil_file_req() so the file chooser only receives existing directories for initial/current folder setup, with fallback to get_xdir() when the requested folder is invalid. This is aimed at preventing the Windows crash that occurs immediately on pressing the Plugin GUI Load button (before file selection).

Browse Source 
Wrapped shortcut-folder setup with existence checks and explicit GError handling so invalid config paths don’t propagate into GTK chooser failures/crashes on Windows.
Removed an unused get_xdir_fs extern declaration from this function while introducing a single xdir value reused across chooser setup logic.
This commit is contained in:
deepend
2026-02-15 16:15:25 -07:00
parent 60c05710b1
commit 7f4ffdb1e5
1 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/fe-gtk/gtkutil.c
View File

@@ -493,9 +493,9 @@ gtkutil_file_req (GtkWindow *parent, const char *title, void *callback, void *us
struct file_req *freq; struct file_req *freq;
GtkWidget *dialog; GtkWidget *dialog;
GtkFileFilter *filefilter; GtkFileFilter *filefilter;
extern char *get_xdir_fs (void);
char *token; char *token;
char *tokenbuffer; char *tokenbuffer;
const char *xdir;
if (flags & FRF_WRITE) if (flags & FRF_WRITE)
{ {
@@ -531,20 +531,33 @@ gtkutil_file_req (GtkWindow *parent, const char *title, void *callback, void *us
NULL); NULL);
#endif #endif
xdir = get_xdir ();
if (filter && filter[0] && (flags & FRF_FILTERISINITIAL)) if (filter && filter[0] && (flags & FRF_FILTERISINITIAL))
{ {
if (flags & FRF_WRITE) if (flags & FRF_WRITE)
{ {
char temp[1024]; char temp[1024];
path_part (filter, temp, sizeof (temp)); path_part (filter, temp, sizeof (temp));
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), temp); if (temp[0] && g_file_test (temp, G_FILE_TEST_IS_DIR))
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), temp);
else if (xdir && xdir[0] && g_file_test (xdir, G_FILE_TEST_IS_DIR))
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), xdir);
gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), file_part (filter)); gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), file_part (filter));
} }
else else
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), filter); {
if (g_file_test (filter, G_FILE_TEST_IS_DIR))
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), filter);
else if (xdir && xdir[0] && g_file_test (xdir, G_FILE_TEST_IS_DIR))
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), xdir);
}
} }
else if (!(flags & FRF_RECENTLYUSED)) else if (!(flags & FRF_RECENTLYUSED))
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), get_xdir ()); {
if (xdir && xdir[0] && g_file_test (xdir, G_FILE_TEST_IS_DIR))
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), xdir);
}
if (flags & FRF_MULTIPLE) if (flags & FRF_MULTIPLE)
gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE); gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE);
@@ -570,7 +583,14 @@ gtkutil_file_req (GtkWindow *parent, const char *title, void *callback, void *us
gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog), filefilter); gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog), filefilter);
} }
gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (dialog), get_xdir (), NULL); if (xdir && xdir[0] && g_file_test (xdir, G_FILE_TEST_IS_DIR))
{
GError *shortcut_error = NULL;
gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (dialog), xdir, &shortcut_error);
if (shortcut_error)
g_error_free (shortcut_error);
}
freq = g_new (struct file_req, 1); freq = g_new (struct file_req, 1);
freq->dialog = dialog; freq->dialog = dialog;