Commit b6cefaa0 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor
Browse files

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

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)
parent b123b8d3
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)
Fri Mar 29 17:57:36 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkiconfactory.c (get_default_icons): Fix wrong
......
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)
Fri Mar 29 17:57:36 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkiconfactory.c (get_default_icons): Fix wrong
......
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)
Fri Mar 29 17:57:36 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkiconfactory.c (get_default_icons): Fix wrong
......
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)
Fri Mar 29 17:57:36 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkiconfactory.c (get_default_icons): Fix wrong
......
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)
Fri Mar 29 17:57:36 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkiconfactory.c (get_default_icons): Fix wrong
......
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)
Fri Mar 29 17:57:36 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkiconfactory.c (get_default_icons): Fix wrong
......
......@@ -23,10 +23,10 @@ Overview of Changes in GTK+ 2.0.1
* Misc bug fixes
Other contributors: Jacob Berkman, Dennis Björklund, Seth Burgess,
Murray Cumming, John Elliis, Kang Jeong-He, James Henstridge,
Richard Hult, Thomas Leonard, LEE Sau Dan, Alexey A. Malyshev,
Mark McLoughlin, Michael Meeks,Sven Neumann, Andras Salamon,
Soeren Sandmann, Dan Winship, Yao Zhang
Murray Cumming, Johan Dahlin, John Ellis, Kang Jeong-He,
James Henstridge, Richard Hult, Thomas Leonard, LEE Sau Dan,
Alexey A. Malyshev, Mark McLoughlin, Michael Meeks, Sven Neumann,
Andras Salamon, Soeren Sandmann, Dan Winship, Yao Zhang
Overview of Changes in GTK+ 2.0.0
=================================
......
......@@ -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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment