lib: fix memory leak on connect() failure

Change sockunion_log() to not use strdup(). This fixes a small memory
leak that occurs on every failed connect(), and is simpler/cleaner.

diff --git a/lib/sockunion.c b/lib/sockunion.c
index d1f6d80b23f4c7a758423d19f517f7bd6057e3cc..10224a053fa69dea1c92461b361b0d44b1d5f84b 100644 (file)
--- a/lib/sockunion.c
+++ b/lib/sockunion.c
@@ -297,27 +297,24 @@ sockunion_sizeof (union sockunion *su)
 }
 
 /* return sockunion structure : this function should be revised. */
-static char *
-sockunion_log (union sockunion *su)
+static const char *
+sockunion_log (union sockunion *su, char *buf, size_t len)
 {
-  static char buf[SU_ADDRSTRLEN];
-
   switch (su->sa.sa_family) 
     {
     case AF_INET:
-      snprintf (buf, SU_ADDRSTRLEN, "%s", inet_ntoa (su->sin.sin_addr));
-      break;
+      return inet_ntop(AF_INET, &su->sin.sin_addr, buf, len);
+
 #ifdef HAVE_IPV6
     case AF_INET6:
-      snprintf (buf, SU_ADDRSTRLEN, "%s",
-               inet_ntop (AF_INET6, &(su->sin6.sin6_addr), buf, SU_ADDRSTRLEN));
+      return inet_ntop(AF_INET6, &(su->sin6.sin6_addr), buf, len);
       break;
 #endif /* HAVE_IPV6 */
+
     default:
-      snprintf (buf, SU_ADDRSTRLEN, "af_unknown %d ", su->sa.sa_family);
-      break;
+      snprintf (buf, len, "af_unknown %d ", su->sa.sa_family);
+      return buf;
     }
-  return (XSTRDUP (MTYPE_TMP, buf));
 }
 
 /* sockunion_connect returns
@@ -379,8 +376,10 @@ sockunion_connect (int fd, union sockunion *peersu, unsigned short port,
     {
       if (errno != EINPROGRESS)
        {
+         char str[SU_ADDRSTRLEN];
          zlog_info ("can't connect to %s fd %d : %s",
-                    sockunion_log (&su), fd, safe_strerror (errno));
+                    sockunion_log (&su, str, sizeof str),
+                    fd, safe_strerror (errno));
          return connect_error;
        }
     }