callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix screwup in handling of module path that was resulting in freed memory

Browse Source 
Fri Mar 29 17:41:21 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkmain.c (load_modules): Fix screwup in handling
        of module path that was resulting in freed memory being
        accessed when both GTK_MODULES and a theme were set.
        (#76902, Johan Dahlin)
This commit is contained in:
Owen Taylor
2002-03-29 23:05:11 +00:00
committed by Owen Taylor
parent b123b8d340
commit b6cefaa0b7
8 changed files with 49 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkmain.c
View File

@ -453,8 +453,7 @@ _gtk_find_module (const gchar *name,
}
static GModule *
find_module (gchar **module_path,
const gchar *name)
find_module (const gchar *name)
{
GModule *module;
gchar *module_name;
@ -476,7 +475,6 @@ find_module (gchar **module_path,
static GSList *
load_module (GSList *gtk_modules,
gchar **module_path,
const gchar *name)
{
GtkModuleInitFunc modinit_func = NULL;
@ -484,7 +482,7 @@ load_module (GSList *gtk_modules,
if (g_module_supported ())
{
module = find_module (module_path, name);
module = find_module (name);
if (module &&
g_module_symbol (module, "gtk_module_init", (gpointer *) &modinit_func) &&
modinit_func)
@ -517,18 +515,16 @@ load_module (GSList *gtk_modules,
static GSList *
load_modules (const char *module_str)
{
gchar **module_path = get_module_path ();
gchar **module_names = pango_split_file_list (module_str);
GSList *gtk_modules = NULL;
gint i;
for (i = 0; module_names[i]; i++)
gtk_modules = load_module (gtk_modules, module_path, module_names[i]);
gtk_modules = load_module (gtk_modules, module_names[i]);
gtk_modules = g_slist_reverse (gtk_modules);
g_strfreev (module_names);
g_strfreev (module_path);
return gtk_modules;
}