[GNUnet-SVN] r15789 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2011-06-29 14:20:39 +0200 (Wed, 29 Jun 2011)
New Revision: 15789

Modified:
   gnunet/src/transport/plugin_transport_http.c
Log:
fixing memory leak


Modified: gnunet/src/transport/plugin_transport_http.c
===================================================================
--- gnunet/src/transport/plugin_transport_http.c        2011-06-29 11:40:03 UTC 
(rev 15788)
+++ gnunet/src/transport/plugin_transport_http.c        2011-06-29 12:20:39 UTC 
(rev 15789)
@@ -580,7 +580,6 @@
   GNUNET_asprintf(&url,
                   "%s://%s/%s;%u", PROTOCOL_PREFIX, addr_str,
                   (char *) (&plugin->my_ascii_hash_ident),id);
-  GNUNET_free_non_null(addr_str);
   return url;
 }
 
@@ -2840,9 +2839,9 @@
   struct sockaddr_in a4;
   struct sockaddr_in6 a6;
   char * address;
-  char * ret;
+  static char rbuf[INET6_ADDRSTRLEN + 13];
   uint16_t port;
-  unsigned int res;
+  int res;
 
   if (addrlen == sizeof (struct IPv6HttpAddress))
     {
@@ -2865,10 +2864,16 @@
       /* invalid address */
       return NULL;
     }
-  res = GNUNET_asprintf(&ret,"%s:%u",address,port);
+
+  res = GNUNET_snprintf (rbuf,
+                   sizeof (rbuf),
+                   "%s:%u",
+                   address,
+                   port);
+
   GNUNET_free (address);
   GNUNET_assert(res != 0);
-  return ret;
+  return rbuf;
 }
 
 /**