diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2007-02-26 14:09:21 +0000 |
|---|---|---|
| committer | Chris Wilson <cpwilson@src.gnome.org> | 2007-02-26 14:09:21 +0000 |
| commit | e2a74a9bd989370938a15d078d537316b1d8de5d (patch) | |
| tree | 225dd21eb4a54b24cc5d0ce26dc6e8de9065a2af /gtk/gtkicontheme.c | |
| parent | cf9ae5498092db961e4d252ec7517a17f3fae74c (diff) | |
| download | gtk+-e2a74a9bd989370938a15d078d537316b1d8de5d.tar.gz | |
Bug 409101 – invalid read to gtkicontheme.c insert_theme(), might cause
2007-02-26 Chris Wilson <chris@chris-wilson.co.uk>
Bug 409101 – invalid read to gtkicontheme.c insert_theme(), might cause gnome-panel crash
* gtk/gtkicontheme.c: (scan_directory):
Reorder the replacement of the shared base_name key, so that we
avoid dereferencing the string in the icon_theme->all_icon
hash table after freeing it from the dir->icons hash table.
svn path=/trunk/; revision=17353
Diffstat (limited to 'gtk/gtkicontheme.c')
| -rw-r--r-- | gtk/gtkicontheme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index 2e404e788f..3133935a21 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -2203,8 +2203,8 @@ scan_directory (GtkIconThemePrivate *icon_theme, base_name = strip_suffix (name); hash_suffix = GPOINTER_TO_INT (g_hash_table_lookup (dir->icons, base_name)); - g_hash_table_replace (dir->icons, base_name, GUINT_TO_POINTER (hash_suffix| suffix)); g_hash_table_insert (icon_theme->all_icons, base_name, NULL); + g_hash_table_replace (dir->icons, base_name, GUINT_TO_POINTER (hash_suffix| suffix)); } g_dir_close (gdir); |