[Xfce4-commits] <parole:bluesabre/gtk3> Coverity fixes

Sean Davis noreply at xfce.org
Fri Sep 13 02:54:01 CEST 2013


Updating branch refs/heads/bluesabre/gtk3
         to 3c5d4f71fe84a86b4c3dfd147027fe9e8e2551cb (commit)
       from ce2d71b625142f5b161a711ad98368c6e089e764 (commit)

commit 3c5d4f71fe84a86b4c3dfd147027fe9e8e2551cb
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Thu Sep 12 20:52:44 2013 -0400

    Coverity fixes

 src/gst/parole-gst.c           |    4 ----
 src/misc/parole-pl-parser.c    |    4 ++--
 src/parole-conf-dialog.c       |    4 +++-
 src/parole-medialist.c         |   14 ++++++-------
 src/parole-player.c            |    3 +--
 src/parole-plugins-manager.c   |   45 ++++++++++++++++++++--------------------
 src/parole-subtitle-encoding.c |   33 +++++++++++++++--------------
 7 files changed, 54 insertions(+), 53 deletions(-)

diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index 975f1af..c6bca2b 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -2812,10 +2812,6 @@ gst_get_lang_list_for_type (ParoleGst * gst, const gchar * type_name)
                             ret = g_list_prepend (ret, lc);
                         g_free (cd);
                     } 
-                    else if (cd) 
-                    {
-                        ret = g_list_prepend (ret, cd);
-                    } 
                     else 
                     {
                         ret = g_list_prepend (ret, g_strdup_printf (_("Subtitle #%d"), num++));
diff --git a/src/misc/parole-pl-parser.c b/src/misc/parole-pl-parser.c
index 618cfd1..5de12e2 100644
--- a/src/misc/parole-pl-parser.c
+++ b/src/misc/parole-pl-parser.c
@@ -326,7 +326,7 @@ parole_pl_parser_parse_m3u (const gchar *filename)
     GFile *file;
     gchar **lines;
     gchar *contents;
-    gchar *path, *pl_filename;
+    gchar *path, *pl_filename = NULL;
     GSList *list = NULL;
     gsize size;
     guint num_lines;
@@ -722,7 +722,7 @@ out:
 gboolean parole_pl_parser_save_from_files (GSList *files, const gchar *filename, ParolePlFormat format)
 {
     FILE *f;
-    gboolean ret_val;
+    gboolean ret_val = FALSE;
 
     PAROLE_DEBUG_ENUM_FULL (format, PAROLE_ENUM_TYPE_PL_FORMAT, "Saving playlist %s ", filename);
 
diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index 27bf5df..8dd1821 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -284,7 +284,7 @@ void saturation_value_changed_cb (GtkRange *range, ParoleConfDialog *self)
 
 void parole_conf_dialog_vis_plugin_changed_cb (GtkComboBox *widget,  ParoleConfDialog *self)
 {
-    gchar *active;
+    gchar *active = NULL;
     GstElementFactory *f;
     
     GtkTreeIter iter;
@@ -292,6 +292,8 @@ void parole_conf_dialog_vis_plugin_changed_cb (GtkComboBox *widget,  ParoleConfD
     
     if (gtk_combo_box_get_active_iter (widget, &iter))
         gtk_tree_model_get (model, &iter, 0, &active, -1);
+    else
+        return;
     
     f = g_hash_table_lookup (self->priv->vis_plugins, active);
     
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index 9b08729..523a3ab 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -596,7 +596,7 @@ parole_media_list_get_first_selected_row (ParoleMediaList *list)
 static ParoleFile *
 parole_media_list_get_first_selected_file (ParoleMediaList *list)
 {
-    ParoleFile *file;
+    ParoleFile *file = NULL;
     GtkTreeRowReference *row;
     GtkTreeIter iter;
 
@@ -889,7 +889,7 @@ parole_media_list_paths_to_row_list (GList *path_list, GtkTreeModel *model)
         path = g_list_nth_data (path_list, i);
         
         row = gtk_tree_row_reference_new (model, path);
-        path = gtk_tree_row_reference_get_path (row);
+
         row_list = g_list_append (row_list, row);
     }
     
@@ -1027,8 +1027,8 @@ parole_media_list_move_up_clicked_cb (GtkButton *button, ParoleMediaList *list)
                 for (i=0; i<g_list_length(path_list); i++)
                 {
                     path = g_list_nth_data (path_list, i);
-                    gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &current, path);
-                    gtk_list_store_move_before(GTK_LIST_STORE(model), &current, &iter);
+                    if (gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &current, path))
+                        gtk_list_store_move_before(GTK_LIST_STORE(model), &current, &iter);
                 }
             }
         }
@@ -1075,8 +1075,8 @@ parole_media_list_move_down_clicked_cb (GtkButton *button, ParoleMediaList *list
             for (i=0; i<g_list_length(path_list); i++)
             {
                 path = g_list_nth_data (path_list, i);
-                gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &current, path);
-                gtk_list_store_move_after(GTK_LIST_STORE(model), &current, &iter);
+                if (gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &current, path))
+                    gtk_list_store_move_after(GTK_LIST_STORE(model), &current, &iter);
             }
         }
 
@@ -1936,7 +1936,7 @@ GtkTreeRowReference *row)
         else
         {
             if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->disc_store), &iter, path) )
-                gtk_tree_model_get (GTK_TREE_MODEL(list->priv->store), &iter, NAME_COL, &name, -1);
+                gtk_tree_model_get (GTK_TREE_MODEL(list->priv->disc_store), &iter, NAME_COL, &name, -1);
         }
         
         gtk_tree_path_free (path);
diff --git a/src/parole-player.c b/src/parole-player.c
index f3908c4..e2246b5 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -1187,7 +1187,7 @@ parole_player_recent_menu_item_activated_cb (GtkWidget *widget, ParolePlayer *pl
 {
     gchar *uri;
     gchar *filename;
-    gchar *filenames[1];
+    gchar *filenames[] = {NULL, NULL};
     ParoleMediaList *list;
     
     uri = gtk_recent_chooser_get_current_uri(GTK_RECENT_CHOOSER(widget));
@@ -1199,7 +1199,6 @@ parole_player_recent_menu_item_activated_cb (GtkWidget *widget, ParolePlayer *pl
         gtk_recent_manager_add_item (player->priv->recent, uri);
     
         filenames[0] = g_strdup(filename);
-        filenames[1] = NULL;
         
         list = parole_player_get_media_list (player);
         parole_media_list_add_files (list, filenames, FALSE);
diff --git a/src/parole-plugins-manager.c b/src/parole-plugins-manager.c
index 3fdfc45..1f03249 100644
--- a/src/parole-plugins-manager.c
+++ b/src/parole-plugins-manager.c
@@ -252,36 +252,37 @@ parole_plugins_manager_cell_toggled_cb (GtkCellRendererToggle *cell_renderer,
     ParoleProviderModule *module;
     GtkTreeIter iter;
     GtkTreePath *path;
-    gboolean active;
+    gboolean active = FALSE;
 
     path = gtk_tree_path_new_from_string (path_str);
 
-    gtk_tree_model_get_iter (GTK_TREE_MODEL (pref->store), &iter, path);
-
-    gtk_tree_model_get (GTK_TREE_MODEL (pref->store), &iter, 
-                        COL_ACTIVE, &active, 
-                        COL_MODULE, &module,
-                        -1);
+    if (gtk_tree_model_get_iter (GTK_TREE_MODEL (pref->store), &iter, path))
+    {
+        gtk_tree_model_get (GTK_TREE_MODEL (pref->store), &iter, 
+                            COL_ACTIVE, &active, 
+                            COL_MODULE, &module,
+                            -1);
 
-    active ^= 1;
+        active ^= 1;
 
-    if ( pref->manager->priv->load_plugins )
-    {
-        if ( active )
-        {
-            g_type_module_use (G_TYPE_MODULE (module));
-            parole_provider_module_new_plugin (module);
-        }
-        else
+        if ( pref->manager->priv->load_plugins )
         {
-            parole_provider_module_free_plugin (module);
-            g_type_module_unuse (G_TYPE_MODULE (module));
+            if ( active )
+            {
+                g_type_module_use (G_TYPE_MODULE (module));
+                parole_provider_module_new_plugin (module);
+            }
+            else
+            {
+                parole_provider_module_free_plugin (module);
+                g_type_module_unuse (G_TYPE_MODULE (module));
+            }
         }
-    }
 
-    gtk_list_store_set (GTK_LIST_STORE (pref->store), &iter, 
-                        COL_ACTIVE, active,
-                        -1);
+        gtk_list_store_set (GTK_LIST_STORE (pref->store), &iter, 
+                            COL_ACTIVE, active,
+                            -1);
+    }
 
     gtk_tree_path_free (path);
 
diff --git a/src/parole-subtitle-encoding.c b/src/parole-subtitle-encoding.c
index f2d5486..9b0d97b 100644
--- a/src/parole-subtitle-encoding.c
+++ b/src/parole-subtitle-encoding.c
@@ -510,22 +510,25 @@ parole_subtitle_encoding_set (GtkComboBox * combo, const char *encoding)
 
   model = gtk_combo_box_get_model (combo);
   index_i = subtitle_encoding_get_index (encoding);
-  gtk_tree_model_get_iter_first (model, &iter);
   
-  do {
-    if (!gtk_tree_model_iter_has_child (model, &iter))
-      continue;
-    if (!gtk_tree_model_iter_children (model, &iter2, &iter))
-      continue;
-    do {
-      gtk_tree_model_get (model, &iter2, INDEX_COL, &i, -1);
-      if (i == index_i)
-        break;
-    } while (gtk_tree_model_iter_next (model, &iter2));
-    if (i == index_i)
-      break;
-  } while (gtk_tree_model_iter_next (model, &iter));
-  gtk_combo_box_set_active_iter (combo, &iter2);
+  if (gtk_tree_model_get_iter_first (model, &iter))
+  {
+  
+      do {
+        if (!gtk_tree_model_iter_has_child (model, &iter))
+          continue;
+        if (!gtk_tree_model_iter_children (model, &iter2, &iter))
+          continue;
+        do {
+          gtk_tree_model_get (model, &iter2, INDEX_COL, &i, -1);
+          if (i == index_i)
+            break;
+        } while (gtk_tree_model_iter_next (model, &iter2));
+        if (i == index_i)
+          break;
+      } while (gtk_tree_model_iter_next (model, &iter));
+      gtk_combo_box_set_active_iter (combo, &iter2);
+  }
 }
 
 void


More information about the Xfce4-commits mailing list