callisto-debian/gtk3
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
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> Fri Mar 29 17:57:36 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkiconfactory.c (get_default_icons): Fix wrong * gtk/gtkiconfactory.c (get_default_icons): Fix wrong

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
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> Fri Mar 29 17:57:36 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkiconfactory.c (get_default_icons): Fix wrong * gtk/gtkiconfactory.c (get_default_icons): Fix wrong

7
ChangeLog.pre-2-2
View File

@ -1,3 +1,10 @@
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> Fri Mar 29 17:57:36 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkiconfactory.c (get_default_icons): Fix wrong * gtk/gtkiconfactory.c (get_default_icons): Fix wrong

7
ChangeLog.pre-2-4
View File

@ -1,3 +1,10 @@
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> Fri Mar 29 17:57:36 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkiconfactory.c (get_default_icons): Fix wrong * gtk/gtkiconfactory.c (get_default_icons): Fix wrong

7
ChangeLog.pre-2-6
View File

@ -1,3 +1,10 @@
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> Fri Mar 29 17:57:36 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkiconfactory.c (get_default_icons): Fix wrong * gtk/gtkiconfactory.c (get_default_icons): Fix wrong

7
ChangeLog.pre-2-8
View File

@ -1,3 +1,10 @@
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> Fri Mar 29 17:57:36 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkiconfactory.c (get_default_icons): Fix wrong * gtk/gtkiconfactory.c (get_default_icons): Fix wrong

8
NEWS
View File

@ -23,10 +23,10 @@ Overview of Changes in GTK+ 2.0.1
* Misc bug fixes * Misc bug fixes
Other contributors: Jacob Berkman, Dennis Björklund, Seth Burgess, Other contributors: Jacob Berkman, Dennis Björklund, Seth Burgess,
Murray Cumming, John Elliis, Kang Jeong-He, James Henstridge, Murray Cumming, Johan Dahlin, John Ellis, Kang Jeong-He,
Richard Hult, Thomas Leonard, LEE Sau Dan, Alexey A. Malyshev, James Henstridge, Richard Hult, Thomas Leonard, LEE Sau Dan,
Mark McLoughlin, Michael Meeks,Sven Neumann, Andras Salamon, Alexey A. Malyshev, Mark McLoughlin, Michael Meeks, Sven Neumann,
Soeren Sandmann, Dan Winship, Yao Zhang Andras Salamon, Soeren Sandmann, Dan Winship, Yao Zhang
Overview of Changes in GTK+ 2.0.0 Overview of Changes in GTK+ 2.0.0
================================= =================================

10
gtk/gtkmain.c
View File

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