changes

[oweals/gnunet.git] / src / transport / test_plugin_transport.c

diff --git a/src/transport/test_plugin_transport.c b/src/transport/test_plugin_transport.c
index bc7df9880a73fe91532fdc772b25fbe4fb3c388a..e3ab5fd561792e64fcb4874b08d17acaea78ff48 100644 (file)
--- a/src/transport/test_plugin_transport.c
+++ b/src/transport/test_plugin_transport.c
@@ -272,7 +272,7 @@ env_notify_address (void *cls,
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                   _("Plugin added address `%s'\n"), a2s);
 
-      if (GNUNET_OK != api->string_to_address (api, a2s, strlen (a2s)+1, &s2a, &s2a_len))
+      if ((GNUNET_OK != api->string_to_address (api, a2s, strlen (a2s)+1, &s2a, &s2a_len)) || (NULL == s2a))
       {
           GNUNET_break (0);
           GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -292,7 +292,8 @@ env_notify_address (void *cls,
             GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                         _("Plugin creates different address length when connecting back and forth!\n"));
       }
-
+      GNUNET_free (s2a);
+      GNUNET_free (a2s);
       if (GNUNET_OK != api->check_address (api->cls, w->addr, w->addrlen))
       {
           GNUNET_break (0);
@@ -450,7 +451,8 @@ run (void *cls, char *const *args, const char *cfgfile,
   /* load plugins... */
   setup_plugin_environment ();
 
-  plugin = strrchr(argv[0],'_');
+  GNUNET_assert (strlen (argv[0]) > strlen ("test_plugin_"));
+  plugin = strstr(argv[0],"test_plugin_");
   sep = strrchr(argv[0],'.');
   if (NULL == plugin)
   {
@@ -458,7 +460,7 @@ run (void *cls, char *const *args, const char *cfgfile,
       end_badly_now ();
       return;
   }
-  plugin++;
+  plugin += strlen ("test_plugin_");
   if (NULL != sep)
       sep[0] = '\0';