[easytag/wip/clang-analyzer: 7/14] Return early if gtk_tree_model_return_iter failed

[David King <davidk src gnome org>]

commit 89dbc6163b1c6ac7dd9398053a85104fbc2332ba
Author: David King <amigadave amigadave com>
Date:   Mon Aug 12 16:34:42 2013 +0100

    Return early if gtk_tree_model_return_iter failed

 src/cddb.c    |   13 +++++++++++--
 src/picture.c |   22 ++++++++++++++++++++--
 2 files changed, 31 insertions(+), 4 deletions(-)
---
diff --git a/src/cddb.c b/src/cddb.c
index d578323..cd5a9dd 100644
--- a/src/cddb.c
+++ b/src/cddb.c
@@ -3908,8 +3908,17 @@ Cddb_Set_Track_Infos_To_File_List (void)
             }
         }
 
-        if (gtk_tree_model_get_iter(GTK_TREE_MODEL(CddbTrackListModel), &currentIter, currentPath))
-            gtk_tree_model_get(GTK_TREE_MODEL(CddbTrackListModel), &currentIter, CDDB_TRACK_LIST_DATA, 
&cddbtrackalbum, -1);
+        if (gtk_tree_model_get_iter (GTK_TREE_MODEL (CddbTrackListModel),
+                                     &currentIter, currentPath))
+        {
+            gtk_tree_model_get (GTK_TREE_MODEL (CddbTrackListModel),
+                                &currentIter, CDDB_TRACK_LIST_DATA,
+                                &cddbtrackalbum, -1);
+        }
+        else
+        {
+            g_warning ("Iter not found matching path in CDDB track list model");
+        }
 
         // Set values in the ETFile
         if (CDDB_USE_DLM)
diff --git a/src/picture.c b/src/picture.c
index 0e37a9b..e7709c9 100644
--- a/src/picture.c
+++ b/src/picture.c
@@ -462,8 +462,17 @@ void Picture_Properties_Button_Clicked (GObject *object)
 
         // Get corresponding picture
         valid = gtk_tree_model_get_iter(GTK_TREE_MODEL(model), &iter, path);
+
         if (valid)
-            gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, PICTURE_COLUMN_DATA, &pic, -1);
+        {
+            gtk_tree_model_get (GTK_TREE_MODEL (model), &iter,
+                                PICTURE_COLUMN_DATA, &pic, -1);
+        }
+        else
+        {
+            g_warning ("Iter not found in picture model");
+            break;
+        }
 
         title = g_strdup_printf (_("Image Properties %d/%d"), selection_i++,
                                  selection_nbr);
@@ -663,8 +672,17 @@ void Picture_Save_Button_Clicked (GObject *object)
 
         // Get corresponding picture
         valid = gtk_tree_model_get_iter(GTK_TREE_MODEL(model), &iter, path);
+
         if (valid)
-            gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, PICTURE_COLUMN_DATA, &pic, -1);
+        {
+            gtk_tree_model_get (GTK_TREE_MODEL (model), &iter,
+                                PICTURE_COLUMN_DATA, &pic, -1);
+        }
+        else
+        {
+            g_warning ("Iter not found in picture model");
+            break;
+        }
 
         title = g_strdup_printf (_("Save Image %d/%d"), selection_i++,
                                  selection_nbr);