7 files changed, 15 insertions, 8 deletions

diff --git a/src/util/client.c b/src/util/client.c
index afd2fe900..4e5eca32a 100644
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -745,6 +745,7 @@ test_service_configuration (const char *service_name,
                                service_name,
                                "UNIXPATH",
                                _ ("not a valid filename"));
+    GNUNET_free (unixpath);
     return GNUNET_SYSERR;   /* UNIXPATH specified but invalid! */
   }
   GNUNET_free (unixpath);
diff --git a/src/util/configuration.c b/src/util/configuration.c
index dff3c2e99..1aa52ad76 100644
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -1007,6 +1007,7 @@ GNUNET_CONFIGURATION_parse (struct GNUNET_CONFIGURATION_Handle *cfg,
                cf->source_filename,
                parent->source_filename,
                filename);
+        GNUNET_free (fn);
         return GNUNET_SYSERR;
       }
     }
diff --git a/src/util/crypto_hkdf.c b/src/util/crypto_hkdf.c
index 86a814b12..7270b87b6 100644
--- a/src/util/crypto_hkdf.c
+++ b/src/util/crypto_hkdf.c
@@ -77,7 +77,11 @@ static const void *
 doHMAC (gcry_md_hd_t mac, const void *key, size_t key_len, const void *buf,
         size_t buf_len)
 {
-  gcry_md_setkey (mac, key, key_len);
+  if (GPG_ERR_NO_ERROR != gcry_md_setkey (mac, key, key_len))
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
   gcry_md_write (mac, buf, buf_len);
 
   return (const void *) gcry_md_read (mac, 0);
diff --git a/src/util/disk.c b/src/util/disk.c
index ada35249f..2efb52d46 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -1020,6 +1020,7 @@ GNUNET_DISK_glob (const char *glob_pattern,
     LOG (GNUNET_ERROR_TYPE_ERROR,
          "unsupported glob pattern: '%s'\n",
          glob_pattern);
+    GNUNET_free (mypat);
     return -1;
   }
 
diff --git a/src/util/network.c b/src/util/network.c
index e771a9834..61da37ab7 100644
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -122,7 +122,7 @@ GNUNET_NETWORK_test_pf (int pf)
   }
   else
   {
-    close (s);
+    GNUNET_break (0 == close (s));
     ret = GNUNET_OK;
   }
   switch (pf)
diff --git a/src/util/os_priority.c b/src/util/os_priority.c
index 1ed9bcbf7..dc2f0f97e 100644
--- a/src/util/os_priority.c
+++ b/src/util/os_priority.c
@@ -316,7 +316,7 @@ open_dev_null (int target_fd, int flags)
   if (-1 == dup2 (fd, target_fd))
   {
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "dup2");
-    (void) close (fd);
+    GNUNET_break (0 == close (fd));
     return;
   }
   GNUNET_break (0 == close (fd));
@@ -395,7 +395,7 @@ start_process (enum GNUNET_OS_InheritStdioFlags std_inheritance,
       if (NULL != childpipe_write)
         GNUNET_DISK_file_close (childpipe_write);
       if (0 <= dup_childpipe_read_fd)
-        close (dup_childpipe_read_fd);
+        GNUNET_break (0 == close (dup_childpipe_read_fd));
       return NULL;
     }
     childpipe_read_fd = dup_childpipe_read_fd;
@@ -474,7 +474,7 @@ start_process (enum GNUNET_OS_InheritStdioFlags std_inheritance,
     if (NULL != childpipe_write)
       GNUNET_DISK_file_close (childpipe_write);
     if (0 <= childpipe_read_fd)
-      close (childpipe_read_fd);
+      GNUNET_break (0 == close (childpipe_read_fd));
     errno = eno;
     return NULL;
   }
@@ -486,7 +486,7 @@ start_process (enum GNUNET_OS_InheritStdioFlags std_inheritance,
     gnunet_proc->control_pipe = childpipe_write;
     if (0 != (std_inheritance & GNUNET_OS_USE_PIPE_CONTROL))
     {
-      close (childpipe_read_fd);
+      GNUNET_break (0 == close (childpipe_read_fd));
     }
     GNUNET_array_grow (lscp, ls, 0);
     return gnunet_proc;
@@ -564,7 +564,7 @@ start_process (enum GNUNET_OS_InheritStdioFlags std_inheritance,
       {
         /* Bury any existing FD, no matter what; they should all be closed
          * on exec anyway and the important ones have been dup'ed away */
-        (void) close (tgt);
+        GNUNET_break (0 == close (tgt));
         GNUNET_assert (-1 != dup2 (lscp[i], tgt));
       }
       /* unset close-on-exec flag */
diff --git a/src/util/strings.c b/src/util/strings.c
index 24335e444..673915888 100644
--- a/src/util/strings.c
+++ b/src/util/strings.c
@@ -1600,7 +1600,7 @@ GNUNET_STRINGS_base64_encode (const void *in,
   char *opt;
 
   ret = 0;
-  GNUNET_assert (len / 4 < SIZE_MAX);
+  GNUNET_assert (len < SIZE_MAX / 4 * 3 );
   opt = GNUNET_malloc (2 + (len * 4 / 3) + 8);
   for (size_t i = 0; i < len; ++i)
   {