style

[oweals/gnunet.git] / src / util / common_logging.c

diff --git a/src/util/common_logging.c b/src/util/common_logging.c
index 79e31246aec274e5f429a95287b8c0a8bdf6ff34..643d6f866129fd5c7549fa1e8a1823f6f1e7b156 100644 (file)
--- a/src/util/common_logging.c
+++ b/src/util/common_logging.c
@@ -180,6 +180,8 @@ GNUNET_log_setup (const char *comp, const char *loglevel, const char *logfile)
   if (logfile == NULL)
     return GNUNET_OK;
   fn = GNUNET_STRINGS_filename_expand (logfile);
+  if (NULL == fn)    
+    return GNUNET_SYSERR;    
   dirwarn = (GNUNET_OK !=  GNUNET_DISK_directory_create_for_file (fn));
   altlog = FOPEN (fn, "a");
   if (altlog == NULL)
@@ -374,7 +376,10 @@ mylog (enum GNUNET_ErrorType kind,
   time (&timetmp);
   memset (date, 0, DATE_STR_SIZE);
   tmptr = localtime (&timetmp);
-  strftime (date, DATE_STR_SIZE, "%b %d %H:%M:%S", tmptr);
+  if (NULL != tmptr)
+    strftime (date, DATE_STR_SIZE, "%b %d %H:%M:%S", tmptr);
+  else
+    strcpy (date, "localtime error");
   if ((0 != (kind & GNUNET_ERROR_TYPE_BULK)) &&
       (last_bulk_time.value != 0) &&
       (0 == strncmp (buf, last_bulk, sizeof (last_bulk))))
@@ -519,25 +524,31 @@ GNUNET_a2s (const struct sockaddr *addr, socklen_t addrlen)
   switch (addr->sa_family)
     {
     case AF_INET:
+      if (addrlen != sizeof (struct sockaddr_in))
+       return "<invalid v4 address>";
       v4 = (const struct sockaddr_in *) addr;
       inet_ntop (AF_INET, &v4->sin_addr, buf, INET_ADDRSTRLEN);
       if (0 == ntohs (v4->sin_port))
         return buf;
       strcat (buf, ":");
-      sprintf (b2, "%u", ntohs (v4->sin_port));
+      GNUNET_snprintf (b2, sizeof(b2), "%u", ntohs (v4->sin_port));
       strcat (buf, b2);
       return buf;
     case AF_INET6:
+      if (addrlen != sizeof (struct sockaddr_in6))
+       return "<invalid v4 address>";
       v6 = (const struct sockaddr_in6 *) addr;
       buf[0] = '[';
       inet_ntop (AF_INET6, &v6->sin6_addr, &buf[1], INET6_ADDRSTRLEN);
       if (0 == ntohs (v6->sin6_port))
         return &buf[1];
       strcat (buf, "]:");
-      sprintf (b2, "%u", ntohs (v6->sin6_port));
+      GNUNET_snprintf (b2, sizeof(b2), "%u", ntohs (v6->sin6_port));
       strcat (buf, b2);
       return buf;
     case AF_UNIX:
+      if (addrlen <= sizeof (sa_family_t))
+       return "<invalid UNIX address>";
       un = (const struct sockaddr_un*) addr;
       off = 0;
       if (un->sun_path[0] == '\0') off++;