Bug 587165 – Double free in initialize_categories()

diff --git a/configure.ac b/configure.ac
index 14e5c40..83598db 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ AC_CONFIG_SRCDIR(README)
 AC_CONFIG_HEADERS(config.h)
 
 # Automake 1.11 - Silent Build Rules
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 # Required Package Versions
 m4_define([glib_minimum_version], [2.16.1])

diff --git a/libedataserver/e-categories.c b/libedataserver/e-categories.c
index 7e19d84..96bdad9 100644 (file)
--- a/libedataserver/e-categories.c
+++ b/libedataserver/e-categories.c
@@ -399,6 +399,7 @@ load_default_categories (void)
                        gettext (cat_info->category),
                        NULL, icon_file, TRUE);
                g_free (icon_file);
+               icon_file = NULL;
                cat_info++;
        }
 }