2 files changed, 34 insertions, 26 deletions

diff --git a/src/testing/gnunet-cmds-helper.c b/src/testing/gnunet-cmds-helper.c
index be58f6f6a..8114d156d 100644
--- a/src/testing/gnunet-cmds-helper.c
+++ b/src/testing/gnunet-cmds-helper.c
@@ -606,7 +606,7 @@ main (int argc, char **argv)
   int i;
   size_t topology_data_length = 0;
   unsigned int read_file;
-  char cr[1] = "\n";
+  char cr[2] = "\n\0";
 
   GNUNET_log_setup ("gnunet-cmds-helper",
                     "DEBUG",
diff --git a/src/testing/testing.c b/src/testing/testing.c
index 22375bc98..aa8dd339c 100644
--- a/src/testing/testing.c
+++ b/src/testing/testing.c
@@ -2102,7 +2102,6 @@ get_node_info (unsigned int num,
          topology->nodes_x,
          topology->nodes_m,
          namespace_n);
-    hkey = GNUNET_new (struct GNUNET_ShortHashCode);
     GNUNET_CRYPTO_hash (&namespace_n, sizeof(namespace_n), &hc);
     memcpy (hkey,
             &hc,
@@ -2131,8 +2130,8 @@ get_node_info (unsigned int num,
       *namespace_ex = namespace;
       *node_connections_ex = node_connections;
     }
-    GNUNET_free (hkey);
   }
+  GNUNET_free (hkey);
 }
 
 
@@ -2382,6 +2381,7 @@ static void
 parse_ac (struct GNUNET_TESTING_NetjailNode *p_node, char *token)
 {
   char *ac_value;
+  int ret;
 
   ac_value = get_value ("AC", token);
   if (NULL != ac_value)
@@ -2389,7 +2389,13 @@ parse_ac (struct GNUNET_TESTING_NetjailNode *p_node, char *token)
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "ac value: %s\n",
          ac_value);
-    sscanf (ac_value, "%u", &p_node->additional_connects);
+    errno = 0;
+    ret = sscanf (ac_value, "%u", &p_node->additional_connects);
+    if (errno != 0)
+    {
+      GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "sscanf");
+    }
+    GNUNET_assert (0 < ret);
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "AC %u\n",
          p_node->additional_connects);
@@ -2421,7 +2427,6 @@ GNUNET_TESTING_get_topo_from_string (char *data)
   struct GNUNET_TESTING_NetjailTopology *topo;
   struct GNUNET_TESTING_NetjailRouter *router;
   struct GNUNET_TESTING_NetjailNamespace *namespace;
-  struct GNUNET_ShortHashCode *hkey;
   struct GNUNET_HashCode hc;
 
   token = strtok_r (data, "\n", &rest);
@@ -2492,7 +2497,8 @@ GNUNET_TESTING_get_topo_from_string (char *data)
     }
     else if (0 == strcmp (key, "K"))
     {
-      hkey = GNUNET_new (struct GNUNET_ShortHashCode);
+      struct GNUNET_ShortHashCode *hkey_k = GNUNET_new (struct
+                                                        GNUNET_ShortHashCode);
       struct GNUNET_TESTING_NetjailNode *k_node = GNUNET_new (struct
                                                               GNUNET_TESTING_NetjailNode);
 
@@ -2504,18 +2510,18 @@ GNUNET_TESTING_get_topo_from_string (char *data)
            out);
       k_node->node_n = out;
       GNUNET_CRYPTO_hash (&out, sizeof(out), &hc);
-      memcpy (hkey,
+      memcpy (hkey_k,
               &hc,
-              sizeof (*hkey));
+              sizeof (*hkey_k));
       k_node->is_global = GNUNET_YES;
 
       if (GNUNET_YES == GNUNET_CONTAINER_multishortmap_contains (
             topo->map_globals,
-            hkey))
+            hkey_k))
         GNUNET_break (0);
       else
         GNUNET_CONTAINER_multishortmap_put (topo->map_globals,
-                                            hkey,
+                                            hkey_k,
                                             k_node,
                                             GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
       LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -2531,7 +2537,8 @@ GNUNET_TESTING_get_topo_from_string (char *data)
     }
     else if (0 == strcmp (key, "R"))
     {
-      hkey = GNUNET_new (struct GNUNET_ShortHashCode);
+      struct GNUNET_ShortHashCode *hkey_r = GNUNET_new (struct
+                                                        GNUNET_ShortHashCode);
       router = GNUNET_new (struct GNUNET_TESTING_NetjailRouter);
 
       LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -2541,9 +2548,9 @@ GNUNET_TESTING_get_topo_from_string (char *data)
            "R: %u\n",
            out);
       GNUNET_CRYPTO_hash (&out, sizeof(out), &hc);
-      memcpy (hkey,
+      memcpy (hkey_r,
               &hc,
-              sizeof (*hkey));
+              sizeof (*hkey_r));
       LOG (GNUNET_ERROR_TYPE_DEBUG,
            "Get value for key tcp_port on R.\n");
       value = get_value ("tcp_port", token);
@@ -2566,10 +2573,10 @@ GNUNET_TESTING_get_topo_from_string (char *data)
       GNUNET_free (value2);
       if (GNUNET_YES == GNUNET_CONTAINER_multishortmap_contains (
             topo->map_namespaces,
-            hkey))
+            hkey_r))
       {
         namespace = GNUNET_CONTAINER_multishortmap_get (topo->map_namespaces,
-                                                        hkey);
+                                                        hkey_r);
       }
       else
       {
@@ -2577,7 +2584,7 @@ GNUNET_TESTING_get_topo_from_string (char *data)
         namespace->namespace_n = out;
         namespace->nodes = GNUNET_CONTAINER_multishortmap_create (1,GNUNET_NO);
         GNUNET_CONTAINER_multishortmap_put (topo->map_namespaces,
-                                            hkey,
+                                            hkey_r,
                                             namespace,
                                             GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
       }
@@ -2588,7 +2595,8 @@ GNUNET_TESTING_get_topo_from_string (char *data)
     {
       struct GNUNET_TESTING_NetjailNode *p_node = GNUNET_new (struct
                                                               GNUNET_TESTING_NetjailNode);
-      hkey = GNUNET_new (struct GNUNET_ShortHashCode);
+      struct GNUNET_ShortHashCode *hkey_p = GNUNET_new (struct
+                                                        GNUNET_ShortHashCode);
 
       LOG (GNUNET_ERROR_TYPE_DEBUG,
            "Get first Value for P.\n");
@@ -2597,16 +2605,16 @@ GNUNET_TESTING_get_topo_from_string (char *data)
            "P: %u\n",
            out);
       GNUNET_CRYPTO_hash (&out, sizeof(out), &hc);
-      memcpy (hkey,
+      memcpy (hkey_p,
               &hc,
-              sizeof (*hkey));
+              sizeof (*hkey_p));
 
       if (GNUNET_YES == GNUNET_CONTAINER_multishortmap_contains (
             topo->map_namespaces,
-            hkey))
+            hkey_p))
       {
         namespace = GNUNET_CONTAINER_multishortmap_get (topo->map_namespaces,
-                                                        hkey);
+                                                        hkey_p);
       }
       else
       {
@@ -2614,7 +2622,7 @@ GNUNET_TESTING_get_topo_from_string (char *data)
         namespace->nodes = GNUNET_CONTAINER_multishortmap_create (1,GNUNET_NO);
         namespace->namespace_n = out;
         GNUNET_CONTAINER_multishortmap_put (topo->map_namespaces,
-                                            hkey,
+                                            hkey_p,
                                             namespace,
                                             GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
       }
@@ -2625,12 +2633,12 @@ GNUNET_TESTING_get_topo_from_string (char *data)
            "P: %u\n",
            out);
       GNUNET_CRYPTO_hash (&out, sizeof(out), &hc);
-      memcpy (hkey,
+      memcpy (hkey_p,
               &hc,
-              sizeof (*hkey));
+              sizeof (*hkey_p));
       if (GNUNET_YES == GNUNET_CONTAINER_multishortmap_contains (
             namespace->nodes,
-            hkey))
+            hkey_p))
       {
         GNUNET_break (0);
       }
@@ -2638,7 +2646,7 @@ GNUNET_TESTING_get_topo_from_string (char *data)
       {
 
         GNUNET_CONTAINER_multishortmap_put (namespace->nodes,
-                                            hkey,
+                                            hkey_p,
                                             p_node,
                                             GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
         LOG (GNUNET_ERROR_TYPE_DEBUG,