check code for 0002774

2 files changed, 11 insertions, 2 deletions

diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index 0b596d021..bb091fafc 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -614,6 +614,13 @@ key_generation_cb (void *cls,
   GST_my_private_key = pk;
 
   GST_stats = GNUNET_STATISTICS_create ("transport", GST_cfg);
+  if (NULL == GST_stats)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Could not access STATISTICS service.  Exiting.\n"));
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
   GST_peerinfo = GNUNET_PEERINFO_connect (GST_cfg);
   memset (&GST_my_public_key, '\0', sizeof (GST_my_public_key));
   memset (&tmp, '\0', sizeof (tmp));
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index 8d026cd32..01d474a0c 100644
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -2309,6 +2309,8 @@ libgnunet_plugin_transport_tcp_init (void *cls)
     return api;
   }
 
+  GNUNET_assert (NULL != env->cfg);
+  GNUNET_assert (NULL != env->stats);
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_number (env->cfg, "transport-tcp",
                                              "MAX_CONNECTIONS",
@@ -2376,8 +2378,8 @@ libgnunet_plugin_transport_tcp_init (void *cls)
   }
   else
   {
-    plugin->nat =
-        GNUNET_NAT_register (env->cfg, GNUNET_YES, 0, 0, NULL, NULL, NULL,
+    plugin->nat = GNUNET_NAT_register (plugin->env->cfg,
+                                                                                                 GNUNET_YES, 0, 0, NULL, NULL, NULL,
                              &try_connection_reversal, plugin);
   }
   api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));