1 files changed, 8 insertions, 1 deletions

diff --git a/src/fs/gnunet-fs-gtk-event_handler.c b/src/fs/gnunet-fs-gtk-event_handler.c
index d7f3d93a..272c9b1d 100644
--- a/src/fs/gnunet-fs-gtk-event_handler.c
+++ b/src/fs/gnunet-fs-gtk-event_handler.c
@@ -495,6 +495,7 @@ download_lost_parent (struct DownloadEntry *de, uint64_t size,
   GtkTreeIter child;
   GtkTreeModel *model;
 
+  GNUNET_assert (NULL != de->uri);
   rr_old = de->rr;
   tab = GNUNET_GTK_add_to_uri_tab (&iter, &de->sr, de->meta, de->uri);
   de->sr->download = de;
@@ -560,6 +561,7 @@ setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
   GtkTreePath *path;
   struct SearchResult *srp;
 
+  GNUNET_assert (NULL != uri);
   if (de == NULL)
   {
     de = GNUNET_malloc (sizeof (struct DownloadEntry));
@@ -1263,7 +1265,8 @@ GNUNET_GTK_add_search_result (struct SearchTab *tab, GtkTreeIter * iter,
   GtkTreeStore *ts;
   uint64_t fsize;
 
-  if ((uri != NULL) && (!GNUNET_FS_uri_test_loc (uri)) &&
+  GNUNET_assert (NULL != uri);
+  if ((!GNUNET_FS_uri_test_loc (uri)) &&
       (!GNUNET_FS_uri_test_chk (uri)))
   {
     fsize = 0;
@@ -1392,6 +1395,7 @@ process_search_result (void *cls, struct SearchResult *parent,
   struct SearchResult *sr;
   GtkTreeIter iter;
 
+  GNUNET_assert (NULL != uri);
   sr = GNUNET_GTK_add_search_result (tab, &iter,
                                      (parent != NULL) ? parent->rr : NULL, uri,
                                      meta, result, applicability_rank);
@@ -1419,6 +1423,7 @@ GNUNET_GTK_add_to_uri_tab (GtkTreeIter * iter, struct SearchResult **srp,
   GtkNotebook *notebook;
   gint page;
 
+  GNUNET_assert (NULL != uri);
   if (uri_tab == NULL)
   {
     uri_tab = setup_search (NULL, NULL);
@@ -1860,6 +1865,7 @@ GNUNET_GTK_fs_event_handler (void *cls,
                                info->value.search.specifics.resume.message);
     return ret;
   case GNUNET_FS_STATUS_SEARCH_RESUME_RESULT:
+    GNUNET_assert (NULL != info->value.search.specifics.resume_result.uri);
     ret =
         process_search_result (info->value.search.cctx, info->value.search.pctx,
                                info->value.search.specifics.resume_result.uri,
@@ -1881,6 +1887,7 @@ GNUNET_GTK_fs_event_handler (void *cls,
     close_search_tab (info->value.search.cctx);
     return NULL;
   case GNUNET_FS_STATUS_SEARCH_RESULT:
+    GNUNET_assert (NULL != info->value.search.specifics.result.uri);
     return process_search_result (info->value.search.cctx,
                                   info->value.search.pctx,
                                   info->value.search.specifics.result.uri,