adding more error checking to help debug #1761

1 files changed, 10 insertions, 2 deletions

diff --git a/src/fs/gnunet-fs-gtk-event_handler.c b/src/fs/gnunet-fs-gtk-event_handler.c
index 7f67a436..3da406c9 100644
--- a/src/fs/gnunet-fs-gtk-event_handler.c
+++ b/src/fs/gnunet-fs-gtk-event_handler.c
@@ -1487,9 +1487,17 @@ free_search_result (struct SearchResult *sr)
     GNUNET_break (0);
     return;
   }
+  GNUNET_assert (sr->rr != NULL);
   tp = gtk_tree_row_reference_get_path (sr->rr);
+  GNUNET_assert (tp != NULL);
   tm = gtk_tree_row_reference_get_model (sr->rr);
-  gtk_tree_model_get_iter (tm, &iter, tp);
+  GNUNET_assert (tm != NULL);
+  if (TRUE != gtk_tree_model_get_iter (tm, &iter, tp))
+    {
+      GNUNET_break (0);
+      gtk_tree_path_free (tp);
+      return;
+    }
   gtk_tree_path_free (tp);
   gtk_tree_model_get (tm, &iter, 0, &meta, 1, &uri, -1);
   if (uri != NULL)
@@ -1497,7 +1505,7 @@ free_search_result (struct SearchResult *sr)
   if (meta != NULL)
     GNUNET_CONTAINER_meta_data_destroy (meta);
   gtk_tree_row_reference_free (sr->rr);
-  gtk_tree_store_remove (GTK_TREE_STORE (tm), &iter);
+  (void) gtk_tree_store_remove (GTK_TREE_STORE (tm), &iter);
   GNUNET_free (sr);
 }