need more checks

2 files changed, 8 insertions, 2 deletions

diff --git a/src/nat/nat.c b/src/nat/nat.c
index 5db799a90..c4a4c75cb 100644
--- a/src/nat/nat.c
+++ b/src/nat/nat.c
@@ -934,7 +934,9 @@ GNUNET_NAT_register (const struct GNUNET_CONFIGURATION_Handle *cfg,
       h->local_addrlens = GNUNET_malloc (num_addrs * sizeof (socklen_t));
       for (i=0;i<num_addrs;i++)
         {
-          h->local_addrlens[i] = addrlens[i];
+          GNUNET_assert (addrlens[i] > 0);
+          GNUNET_assert (addrs[i] != NULL);
+          h->local_addrlens[i] = addrlens[i];
           h->local_addrs[i] = GNUNET_malloc (addrlens[i]);
           memcpy (h->local_addrs[i], addrs[i], addrlens[i]);
         }
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index 872bac4ce..41f8fb911 100644
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -2076,7 +2076,11 @@ libgnunet_plugin_transport_tcp_init (void *cls)
                                          &try_connection_reversal,
                                          plugin);
       while (ret > 0)
-        GNUNET_free (addrs[--ret]);
+      {
+        ret--;
+        GNUNET_assert (addrs[ret] != NULL);
+        GNUNET_free (addrs[ret]);
+      }
       GNUNET_free_non_null (addrs);
       GNUNET_free_non_null (addrlens);
     }