3 files changed, 6 insertions, 2 deletions

diff --git a/src/util/disk.c b/src/util/disk.c
index bcede53e4..94615f198 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -704,6 +704,8 @@ GNUNET_DISK_directory_scan (const char *dirName,
 
   GNUNET_assert (dirName != NULL);
   dname = GNUNET_STRINGS_filename_expand (dirName);
+  if (dname == NULL)
+    return GNUNET_SYSERR;
   while ((strlen (dname) > 0) && (dname[strlen (dname) - 1] == DIR_SEPARATOR))
     dname[strlen (dname) - 1] = '\0';
   if (0 != STAT (dname, &istat))
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index c61028187..19469e81e 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -96,11 +96,12 @@ get_path_from_proc_exe ()
   GNUNET_snprintf (fn, 
                    sizeof(fn), "/proc/%u/exe", getpid ());
   size = readlink (fn, lnk, sizeof (lnk)-1);
-  if ((size == 0) || (size >= sizeof(lnk)-1))
+  if (size <= 0)
     {
       GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "readlink", fn);
       return NULL;
     }
+  GNUNET_assert (size < sizeof (lnk));
   lnk[size] = '\0';
   while ((lnk[size] != '/') && (size > 0))
     size--;
diff --git a/src/util/service.c b/src/util/service.c
index a4316768d..cd27380ee 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -732,10 +732,11 @@ add_unixpath (struct sockaddr **saddrs,
           unixpath,
           slen);
   un->sun_path[slen] = '\0';
-  slen += sizeof (sa_family_t);
 #if LINUX
   un->sun_path[0] = '\0';
   slen = sizeof (struct sockaddr_un);
+#else
+  slen += sizeof (sa_family_t);
 #endif
   *saddrs = (struct sockaddr*) un;
   *saddrlens = slen;