Ticket #1855: 1855-missing-check-in-src_mcconfig_get.c-mc_config_-2.patch

src/filehighlight/ini-file-read.c

@@ -243 +243 @@
 mc_fhl_parse_ini_file (mc_fhl_t * fhl)
 {
     gchar **group_names, **orig_group_names;
-    gsize ftype_names_size;
 
     mc_fhl_array_free (fhl);
     fhl->filters = g_ptr_array_new ();
 
-    orig_group_names = group_names = mc_config_get_groups (fhl->config, &ftype_names_size);
+    orig_group_names = group_names = mc_config_get_groups (fhl->config, NULL);
 
     if (group_names == NULL)
         return FALSE;

src/mcconfig/common.c

@@ -208 +208 @@
         return FALSE;
 
     groups = mc_config_get_groups (tmp_config, NULL);
+    if (!groups)
+        return FALSE;
 
     for (curr_grp = groups; *curr_grp != NULL; curr_grp++) {
         keys = mc_config_get_keys (tmp_config, *curr_grp, NULL);

src/mcconfig/get.c

@@ -45 +45 @@
 
     if (!mc_config)
     {
-        ret = g_try_malloc0 (sizeof (gchar **));
         if (len)
             *len = 0;
-        return ret;
+        return NULL;
     }
     ret = g_key_file_get_groups (mc_config->handle, len);
     if (ret == NULL)

src/setup.c

@@ -492 +492 @@
     mc_config_t *tmp_cfg;
     char **groups, **curr_grp;
     const char *need_grp;
-    gsize groups_count;
 
     if (!exist_file(profile))
         return;
@@ -501 +500 @@
     if (!tmp_cfg)
         return;
 
-    curr_grp = groups = mc_config_get_groups (tmp_cfg, &groups_count);
+    curr_grp = groups = mc_config_get_groups (tmp_cfg, NULL);
     if (!groups)
     {
         mc_config_deinit(tmp_cfg);

src/skin/colors.c

@@ -250 +250 @@
 static void
 mc_skin_color_check_bw_mode (mc_skin_t * mc_skin)
 {
-    gsize items_count;
     gchar **groups, **orig_groups;
 
     if (!mc_args__disable_colors)
         return;
 
-    orig_groups = groups = mc_config_get_groups (mc_skin->config, &items_count);
+    orig_groups = groups = mc_config_get_groups (mc_skin->config, NULL);
 
     if (groups == NULL)
         return;