[GNUnet-SVN] r24529 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2012-10-25 09:19:02 +0200 (Thu, 25 Oct 2012)
New Revision: 24529

Modified:
   gnunet/src/fs/gnunet-service-fs_indexing.c
Log:
-fi

Modified: gnunet/src/fs/gnunet-service-fs_indexing.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_indexing.c  2012-10-25 03:33:14 UTC (rev 
24528)
+++ gnunet/src/fs/gnunet-service-fs_indexing.c  2012-10-25 07:19:02 UTC (rev 
24529)
@@ -231,7 +231,7 @@
   {
     ir = GNUNET_CONTAINER_multihashmap_get (ifm,
                                            &ii->file_id);
-    GNUNET_assert (NULL != ii);
+    GNUNET_assert (NULL != ir);
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 _
                 ("Index request received for file `%s' is already indexed as 
`%s'.  Permitting anyway.\n"),
@@ -529,6 +529,11 @@
   odb = (const struct OnDemandBlock *) data;
   off = GNUNET_ntohll (odb->offset);
   ii = GNUNET_CONTAINER_multihashmap_get (ifm, &odb->file_id);
+  if (NULL == ii)
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
   fn = ii->filename;
   if ((NULL == fn) || (0 != ACCESS (fn, R_OK)))
   {