From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 4 Nov 2011 13:38:39 +0000 (+0000)
Subject: handle NULL
X-Git-Tag: initial-import-from-subversion-38251~16056
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=091f876f017dee24aaa2b8e92463536f43aff054;p=oweals%2Fgnunet.git

handle NULL
---

diff --git a/src/fs/gnunet-service-fs_indexing.c b/src/fs/gnunet-service-fs_indexing.c
index ce3f21cd6..5978e4d66 100644
--- a/src/fs/gnunet-service-fs_indexing.c
+++ b/src/fs/gnunet-service-fs_indexing.c
@@ -538,7 +538,8 @@ GNUNET_FS_handle_on_demand_block (const GNUNET_HashCode * key, uint32_t size,
   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_FS_handle_on_demand_block (const GNUNET_HashCode * key, uint32_t size,
                              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))) ||