From 9b9b15d3cc2a9d982d77e7b0f6459dc7eaf88c4c Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 25 Mar 2011 07:35:15 +0000 Subject: [PATCH] ems --- src/fs/fs_uri.c | 3 ++- src/fs/gnunet-download.c | 6 ++++++ src/fs/gnunet-service-fs_new.c | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/fs/fs_uri.c b/src/fs/fs_uri.c index 788f60685..4b249d6bf 100644 --- a/src/fs/fs_uri.c +++ b/src/fs/fs_uri.c @@ -406,8 +406,9 @@ uri_chk_parse (const char *s, char **emsg) char h1[sizeof(struct GNUNET_CRYPTO_HashAsciiEncoded)]; char h2[sizeof(struct GNUNET_CRYPTO_HashAsciiEncoded)]; + if (NULL == s) + return NULL; GNUNET_assert (s != NULL); - slen = strlen (s); pos = strlen (GNUNET_FS_URI_CHK_PREFIX); if ( (slen < pos + 2 * sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) + 1) || diff --git a/src/fs/gnunet-download.c b/src/fs/gnunet-download.c index 689cf573d..114154d79 100644 --- a/src/fs/gnunet-download.c +++ b/src/fs/gnunet-download.c @@ -173,6 +173,12 @@ run (void *cls, char *emsg; enum GNUNET_FS_DownloadOptions options; + if (NULL == args[0]) + { + fprintf (stderr, + _("You need to specify a URI argument.\n")); + return; + } uri = GNUNET_FS_uri_parse (args[0], &emsg); if (NULL == uri) diff --git a/src/fs/gnunet-service-fs_new.c b/src/fs/gnunet-service-fs_new.c index fb51ac5ed..1eea28a9d 100644 --- a/src/fs/gnunet-service-fs_new.c +++ b/src/fs/gnunet-service-fs_new.c @@ -418,6 +418,8 @@ shutdown_task (void *cls, } GNUNET_LOAD_value_free (datastore_get_load); datastore_get_load = NULL; + GNUNET_LOAD_value_free (GSF_rt_entry_lifetime); + GSF_rt_entry_lifetime = NULL; } @@ -576,6 +578,7 @@ run (void *cls, GNUNET_SCHEDULER_shutdown (); return; } + GSF_rt_entry_lifetime = GNUNET_LOAD_value_init (GNUNET_TIME_UNIT_FOREVER_REL); GSF_stats = GNUNET_STATISTICS_create ("fs", cfg); block_cfg = GNUNET_CONFIGURATION_create (); GNUNET_CONFIGURATION_set_value_string (block_cfg, -- 2.25.1