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

[gnunet]

Author: grothoff
Date: 2011-11-04 14:38:39 +0100 (Fri, 04 Nov 2011)
New Revision: 17988

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

Modified: gnunet/src/fs/gnunet-service-fs_indexing.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_indexing.c  2011-11-04 13:37:19 UTC (rev 
17987)
+++ gnunet/src/fs/gnunet-service-fs_indexing.c  2011-11-04 13:38:39 UTC (rev 
17988)
@@ -538,7 +538,8 @@
   odb = (const struct OnDemandBlock *) data;
   off = GNUNET_ntohll (odb->offset);
   fn = (const char *) GNUNET_CONTAINER_multihashmap_get (ifm, &odb->file_id);
-  if (0 != ACCESS (fn, R_OK))
+  if ( (NULL == fn) ||
+       (0 != ACCESS (fn, R_OK)) )
   {
     GNUNET_STATISTICS_update (GSF_stats,
                              gettext_noop ("# index blocks removed: original 
file inaccessible"),
@@ -548,9 +549,7 @@
                              GNUNET_TIME_UNIT_FOREVER_REL, &remove_cont, NULL);
     return GNUNET_SYSERR;
   }
-  fh = NULL;
-  if ((NULL == fn) ||
-      (NULL ==
+  if ((NULL ==
        (fh =
         GNUNET_DISK_file_open (fn, GNUNET_DISK_OPEN_READ,
                                GNUNET_DISK_PERM_NONE))) ||