fix

diff --git a/src/fs/fs_uri.c b/src/fs/fs_uri.c
index 95a161370045b14376447637299a0ff1048ff77f..2e1ec92c84368fb284a73da8ab7a70d42525885e 100644 (file)
--- 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 9821aca892ac0e79c43918da8a096e890cf6b675..746dc526727d3e9a5b288a76f379bf6be9e65ea1 100644 (file)
--- 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);