1 files changed, 10 insertions, 3 deletions

diff --git a/src/setup/gnunet-setup-transport.c b/src/setup/gnunet-setup-transport.c
index d0ee29bf..374ed80c 100644
--- a/src/setup/gnunet-setup-transport.c
+++ b/src/setup/gnunet-setup-transport.c
@@ -177,7 +177,11 @@ nipo (void *cls, const char *name, int isDefault,
   in = (const struct sockaddr_in *) addr;
 
   /* set internal IP address */
-  inet_ntop (AF_INET, &in->sin_addr, buf, sizeof (buf));
+  if (NULL == inet_ntop (AF_INET, &in->sin_addr, buf, sizeof (buf)))
+  {
+    GNUNET_break (0);
+    return GNUNET_OK;
+  }
   GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "INTERNAL_ADDRESS", buf);
   entry =
       GTK_ENTRY (GNUNET_SETUP_get_object
@@ -202,7 +206,6 @@ nipo (void *cls, const char *name, int isDefault,
 static void
 set_external_ipv4 (void *cls, const struct in_addr *addr)
 {
-  struct in_addr ia;
   char buf[INET_ADDRSTRLEN];
   GObject *o;
   GtkEntry *entry;
@@ -226,7 +229,11 @@ set_external_ipv4 (void *cls, const struct in_addr *addr)
     }
 
     /* set external IP address */
-    inet_ntop (AF_INET, &ia, buf, sizeof (buf));
+    if (NULL == inet_ntop (AF_INET, addr, buf, sizeof (buf)))
+    {
+      GNUNET_break (0);
+      return;
+    }
     if (NULL != cfg)
       GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "EXTERNAL_ADDRESS",
                                              buf);