From a6d3a7a355634ef0396f009f9286962cdc4c6077 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 17 Jun 2010 19:31:42 +0000
Subject: [PATCH] fix

---
 src/fs/fs_uri.c           | 6 ++++++
 src/util/getopt_helpers.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/fs/fs_uri.c b/src/fs/fs_uri.c
index 95a161370..2e1ec92c8 100644
--- a/src/fs/fs_uri.c
+++ b/src/fs/fs_uri.c
@@ -1032,6 +1032,12 @@ GNUNET_FS_uri_ksk_merge (const struct GNUNET_FS_Uri *u1,
   const char *kp;
   char **kl;
 
+  if ( (u1 == NULL) && (u2 == NULL) )
+    return NULL;
+  if (u1 == NULL)
+    return GNUNET_FS_uri_dup (u2);
+  if (u2 == NULL)
+    return GNUNET_FS_uri_dup (u1);
   if ( (u1->type != ksk) ||
        (u2->type != ksk) )
     {
diff --git a/src/util/getopt_helpers.c b/src/util/getopt_helpers.c
index 9821aca89..746dc5267 100644
--- a/src/util/getopt_helpers.c
+++ b/src/util/getopt_helpers.c
@@ -98,7 +98,7 @@ GNUNET_GETOPT_format_help_ (struct GNUNET_GETOPT_CommandLineProcessorContext
         {
           for (j = p + 78 - slen; j > p; j--)
             {
-              if (isspace (trans[j]))
+              if (isspace ( (unsigned char) trans[j]))
                 {
                   scp = GNUNET_malloc (j - p + 1);
                   memcpy (scp, &trans[p], j - p);
-- 
2.25.1