From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 19 Dec 2011 20:40:58 +0000 (+0000)
Subject: -check for NULL
X-Git-Tag: initial-import-from-subversion-38251~15569
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5fabca7beac62bbbcdf62def324b4ee7405d501c;p=oweals%2Fgnunet.git

-check for NULL
---

diff --git a/src/fs/fs_api.c b/src/fs/fs_api.c
index cd854cf5e..075bedc21 100644
--- a/src/fs/fs_api.c
+++ b/src/fs/fs_api.c
@@ -1795,7 +1795,7 @@ GNUNET_FS_search_result_sync_ (struct GNUNET_FS_SearchResult *sr)
       (GNUNET_OK != GNUNET_BIO_write_int32 (wh, sr->availability_success)) ||
       (GNUNET_OK != GNUNET_BIO_write_int32 (wh, sr->availability_trials)) ||
       (GNUNET_OK != GNUNET_BIO_write (wh, sr->keyword_bitmap,
-				      (sr->uri->data.ksk.keywordCount + 7) / 8)) )
+				      (sr->uri == NULL) ? 0 : (sr->uri->data.ksk.keywordCount + 7) / 8)) )
 
   {
     GNUNET_break (0);
@@ -2101,7 +2101,7 @@ deserialize_search_result (void *cls, const char *filename)
   sr->keyword_bitmap = GNUNET_malloc ((sr->uri->data.ksk.keywordCount + 7) / 8); /* round up, count bits */
   if (GNUNET_OK != GNUNET_BIO_read (rh, "keyword-bitmap",
 				    sr->keyword_bitmap,
-				    (sr->uri->data.ksk.keywordCount + 7) / 8))
+				    (sr->uri == NULL) ? 0 : (sr->uri->data.ksk.keywordCount + 7) / 8))
   {
     GNUNET_break (0);
     goto cleanup;