From: Matthias Wachs <wachs@net.in.tum.de>
Date: Mon, 6 Jun 2011 12:01:09 +0000 (+0000)
Subject: fixes 0-length a2s assertion
X-Git-Tag: initial-import-from-subversion-38251~18313
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cf5339b80c7b2984aa18ff4908173c83efeef6a1;p=oweals%2Fgnunet.git

fixes 0-length a2s assertion
---

diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index 5826adfec..895394c59 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -1673,16 +1673,8 @@ a2s (const char *plugin,
   if (plugin == NULL)
     return NULL;
   p = find_transport (plugin);
-  if (p == NULL)
+  if ((p == NULL) || (addr_len == 0) || (addr == NULL))
     return NULL;
-  if ((addr_len == 0) || (addr == NULL))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              "a2s: malformed address from plugin `%s'\n",
-              p->short_name);
-    GNUNET_assert (addr_len != 0);
-    GNUNET_assert (addr != NULL);
-  }
   return p->api->address_to_string (p->api->cls,
 				    addr,
 				    addr_len);