2 files changed, 10 insertions, 3 deletions

diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index c96652c75..56480d020 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -1108,7 +1108,10 @@ read_blacklist_file (const struct GNUNET_CONFIGURATION_Handle *cfg)
           GNUNET_free (data);
           return;
         }
-      tsize = tsize;
+
+      if (tsize < 1)
+        continue;
+
       transport_name = GNUNET_malloc(tsize + 1);
       memcpy(transport_name, &data[pos], tsize);
       pos = colon_pos + 1;
diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c
index 0d01e6c97..0f424b38a 100644
--- a/src/transport/plugin_transport_udp.c
+++ b/src/transport/plugin_transport_udp.c
@@ -830,7 +830,6 @@ process_interfaces (void *cls,
   struct IPv6UdpAddress t6;
   void *arg;
   uint16_t args;
-
   void *addr_nat;
 
   addr_nat = NULL;
@@ -886,6 +885,11 @@ process_interfaces (void *cls,
       arg = &t6;
       args = sizeof (t6);
     }
+  else
+    {
+      GNUNET_break (0);
+      return GNUNET_OK;
+    }
 
     GNUNET_log (GNUNET_ERROR_TYPE_INFO |
                      GNUNET_ERROR_TYPE_BULK,
@@ -1196,7 +1200,7 @@ udp_demultiplexer(struct Plugin *plugin, struct GNUNET_PeerIdentity *sender,
       GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp",
                       _("Received PROBE REPLY from port %d on incoming port %d\n"), ntohs(((struct sockaddr_in *)sender_addr)->sin_port), sockinfo->port);
 #endif
-      if (sizeof(sender_addr) == sizeof(struct IPv4UdpAddress))
+      if ((sender_addr != NULL) && (sizeof(sender_addr) == sizeof(struct IPv4UdpAddress)))
         {
           memset(&addr_buf, 0, sizeof(addr_buf));
           if (NULL == inet_ntop (AF_INET,