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

Reviewed the plugin GUI code path and fixed two crash-prone null-handling cases that are especially risky on Windows plugin metadata paths:

Browse Source 
fe_pluginlist_update() now guards against pl == NULL, pl->version == NULL, and pl->filename == NULL before dereferencing, and uses safe empty-string fallbacks for filename-backed columns. This prevents null dereferences from malformed or partially-populated plugin entries.
plugingui_unload() now early-returns when the selected plugin filepath is NULL/empty before suffix checks and command formatting, preventing invalid string operations in unload flow.
This commit is contained in:
deepend
2026-02-15 15:41:28 -07:00
parent 47a9729737
commit 3e59822753
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/fe-gtk/plugingui.c
View File

@@ -48,6 +48,12 @@ enum
static GtkWidget *plugin_window = NULL; static GtkWidget *plugin_window = NULL;
static const char *
plugingui_safe_string (const char *value)
{
return value ? value : "";
}
static session * static session *
plugingui_get_target_session (void) plugingui_get_target_session (void)
{ {
@@ -169,14 +175,14 @@ fe_pluginlist_update (void)
while (list) while (list)
{ {
pl = list->data; pl = list->data;
if (pl->version[0] != 0) if (pl && pl->version && pl->version[0] != 0)
{ {
gtk_list_store_append (store, &iter); gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter, NAME_COLUMN, pl->name, gtk_list_store_set (store, &iter, NAME_COLUMN, pl->name,
VERSION_COLUMN, pl->version, VERSION_COLUMN, pl->version,
FILE_COLUMN, file_part (pl->filename), FILE_COLUMN, pl->filename ? file_part (pl->filename) : "",
DESC_COLUMN, pl->desc, DESC_COLUMN, pl->desc,
FILEPATH_COLUMN, pl->filename, -1); FILEPATH_COLUMN, plugingui_safe_string (pl->filename), -1);
} }
list = list->next; list = list->next;
} }
@@ -236,6 +242,12 @@ plugingui_unload (GtkWidget * wid, gpointer unused)
if (!gtkutil_treeview_get_selected (view, &iter, NAME_COLUMN, &modname, if (!gtkutil_treeview_get_selected (view, &iter, NAME_COLUMN, &modname,
FILEPATH_COLUMN, &file, -1)) FILEPATH_COLUMN, &file, -1))
return; return;
if (!file || !*file)
{
g_free (modname);
g_free (file);
return;
}
if (g_str_has_suffix (file, "."PLUGIN_SUFFIX)) if (g_str_has_suffix (file, "."PLUGIN_SUFFIX))
{ {
@@ -315,7 +327,11 @@ plugingui_open (void)
view = plugingui_treeview_new (vbox); view = plugingui_treeview_new (vbox);
view_scroll = gtk_widget_get_parent (view); view_scroll = gtk_widget_get_parent (view);
if (view_scroll) if (view_scroll)
{
gtk_box_set_child_packing (GTK_BOX (vbox), view_scroll, TRUE, TRUE, 0, GTK_PACK_START); gtk_box_set_child_packing (GTK_BOX (vbox), view_scroll, TRUE, TRUE, 0, GTK_PACK_START);
gtk_widget_set_hexpand (view_scroll, TRUE);
gtk_widget_set_vexpand (view_scroll, TRUE);
}
g_object_set_data (G_OBJECT (plugin_window), "view", view); g_object_set_data (G_OBJECT (plugin_window), "view", view);