From f5beb3eaf163fc0bf2a4f86bd413d3ee6939cfea Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 6 Jul 2016 11:14:11 +0000
Subject: -fix misc issues

---
 src/util/bandwidth.c   |  2 +-
 src/util/disk.c        | 10 +++++++++-
 src/util/network.c     |  6 ++++++
 src/util/test_server.c |  1 -
 4 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'src/util')

diff --git a/src/util/bandwidth.c b/src/util/bandwidth.c
index 364c46977..bc5c02d60 100644
--- a/src/util/bandwidth.c
+++ b/src/util/bandwidth.c
@@ -177,7 +177,7 @@ update_excess (struct GNUNET_BANDWIDTH_Tracker *av)
        500000LL) / 1000000LL;
   current_consumption = av->consumption_since_last_update__ - delta_avail;
   /* negative current_consumption means that we have savings */
-  max_carry = av->available_bytes_per_s__ * av->max_carry_s__;
+  max_carry = (uint64_t) av->available_bytes_per_s__ * av->max_carry_s__;
   if (max_carry < GNUNET_SERVER_MAX_MESSAGE_SIZE)
     max_carry = GNUNET_SERVER_MAX_MESSAGE_SIZE;
   left_bytes = max_carry + current_consumption;
diff --git a/src/util/disk.c b/src/util/disk.c
index 4624df7c1..d9ebde84f 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -527,14 +527,18 @@ char *
 GNUNET_DISK_mkdtemp (const char *t)
 {
   char *fn;
+  mode_t omask;
 
+  omask = umask (S_IWGRP | S_IWOTH | SIRGRP | S_IROTH);
   fn = mktemp_name (t);
   if (fn != mkdtemp (fn))
   {
-    LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_ERROR, "mkstemp", fn);
+    LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_ERROR, "mkdtemp", fn);
     GNUNET_free (fn);
+    umask (omask);
     return NULL;
   }
+  umask (omask);
   return fn;
 }
 
@@ -587,14 +591,18 @@ GNUNET_DISK_mktemp (const char *t)
 {
   int fd;
   char *fn;
+  mode_t omask;
 
+  omask = umask (S_IWGRP | S_IWOTH | SIRGRP | S_IROTH);
   fn = mktemp_name (t);
   if (-1 == (fd = mkstemp (fn)))
   {
     LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_ERROR, "mkstemp", fn);
     GNUNET_free (fn);
+    umask (omask);
     return NULL;
   }
+  umask (omask);
   if (0 != CLOSE (fd))
     LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "close", fn);
   return fn;
diff --git a/src/util/network.c b/src/util/network.c
index e42dfc4dc..ba213b412 100644
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -166,6 +166,12 @@ GNUNET_NETWORK_unix_precheck (const struct sockaddr_un *un)
   int ret;
 
   s = socket (AF_UNIX, SOCK_STREAM, 0);
+  if (-1 == s)
+  {
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
+                         "Failed to open AF_UNIX socket");
+    return;
+  }
   ret = connect (s,
                  (struct sockaddr *) un,
                  sizeof (struct sockaddr_un));
diff --git a/src/util/test_server.c b/src/util/test_server.c
index f82ecb2b1..384a1cef0 100644
--- a/src/util/test_server.c
+++ b/src/util/test_server.c
@@ -239,7 +239,6 @@ task (void *cls)
     GNUNET_MQ_handler_end ()
   };
 
-
   sap[0] = (struct sockaddr *) &sa;
   slens[0] = sizeof (sa);
   sap[1] = NULL;
-- 
cgit v1.2.3