Prevent unwanted recursion by resetting icon_set->cache before freeing the
Sat Jun 26 01:04:31 2004 Matthias Clasen <maclas@gmx.de> * gtk/gtkiconfactory.c (clear_cache): Prevent unwanted recursion by resetting icon_set->cache before freeing the cache. (#144947, Tim Janik)
This commit is contained in:
parent
957743919b
commit
0f9a4da84d
@ -1,3 +1,9 @@
|
|||||||
|
Sat Jun 26 01:04:31 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
|
* gtk/gtkiconfactory.c (clear_cache): Prevent unwanted
|
||||||
|
recursion by resetting icon_set->cache before freeing
|
||||||
|
the cache. (#144947, Tim Janik)
|
||||||
|
|
||||||
Sat Jun 26 00:40:02 2004 Matthias Clasen <maclas@gmx.de>
|
Sat Jun 26 00:40:02 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
* gtk/gtkiconfactory.c (render_icon_name_pixbuf):
|
* gtk/gtkiconfactory.c (render_icon_name_pixbuf):
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
Sat Jun 26 01:04:31 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
|
* gtk/gtkiconfactory.c (clear_cache): Prevent unwanted
|
||||||
|
recursion by resetting icon_set->cache before freeing
|
||||||
|
the cache. (#144947, Tim Janik)
|
||||||
|
|
||||||
Sat Jun 26 00:40:02 2004 Matthias Clasen <maclas@gmx.de>
|
Sat Jun 26 00:40:02 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
* gtk/gtkiconfactory.c (render_icon_name_pixbuf):
|
* gtk/gtkiconfactory.c (render_icon_name_pixbuf):
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
Sat Jun 26 01:04:31 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
|
* gtk/gtkiconfactory.c (clear_cache): Prevent unwanted
|
||||||
|
recursion by resetting icon_set->cache before freeing
|
||||||
|
the cache. (#144947, Tim Janik)
|
||||||
|
|
||||||
Sat Jun 26 00:40:02 2004 Matthias Clasen <maclas@gmx.de>
|
Sat Jun 26 00:40:02 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
* gtk/gtkiconfactory.c (render_icon_name_pixbuf):
|
* gtk/gtkiconfactory.c (render_icon_name_pixbuf):
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
Sat Jun 26 01:04:31 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
|
* gtk/gtkiconfactory.c (clear_cache): Prevent unwanted
|
||||||
|
recursion by resetting icon_set->cache before freeing
|
||||||
|
the cache. (#144947, Tim Janik)
|
||||||
|
|
||||||
Sat Jun 26 00:40:02 2004 Matthias Clasen <maclas@gmx.de>
|
Sat Jun 26 00:40:02 2004 Matthias Clasen <maclas@gmx.de>
|
||||||
|
|
||||||
* gtk/gtkiconfactory.c (render_icon_name_pixbuf):
|
* gtk/gtkiconfactory.c (render_icon_name_pixbuf):
|
||||||
|
@ -2654,10 +2654,13 @@ static void
|
|||||||
clear_cache (GtkIconSet *icon_set,
|
clear_cache (GtkIconSet *icon_set,
|
||||||
gboolean style_detach)
|
gboolean style_detach)
|
||||||
{
|
{
|
||||||
GSList *tmp_list;
|
GSList *cache, *tmp_list;
|
||||||
GtkStyle *last_style = NULL;
|
GtkStyle *last_style = NULL;
|
||||||
|
|
||||||
tmp_list = icon_set->cache;
|
cache = icon_set->cache;
|
||||||
|
icon_set->cache = NULL;
|
||||||
|
icon_set->cache_size = 0;
|
||||||
|
tmp_list = cache;
|
||||||
while (tmp_list != NULL)
|
while (tmp_list != NULL)
|
||||||
{
|
{
|
||||||
CachedIcon *icon = tmp_list->data;
|
CachedIcon *icon = tmp_list->data;
|
||||||
@ -2681,9 +2684,7 @@ clear_cache (GtkIconSet *icon_set,
|
|||||||
tmp_list = g_slist_next (tmp_list);
|
tmp_list = g_slist_next (tmp_list);
|
||||||
}
|
}
|
||||||
|
|
||||||
g_slist_free (icon_set->cache);
|
g_slist_free (cache);
|
||||||
icon_set->cache = NULL;
|
|
||||||
icon_set->cache_size = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static GSList*
|
static GSList*
|
||||||
|
Loading…
Reference in New Issue
Block a user