fixes

diff --git a/src/util/test_configuration.c b/src/util/test_configuration.c
index 6747c73cb50970272c5d611bc9a552264a368459..fd2b91bfb6781bfdf5ec667dc250b581d7c43b69 100644 (file)
--- a/src/util/test_configuration.c
+++ b/src/util/test_configuration.c
@@ -492,15 +492,22 @@ main (int argc, char *argv[])
       GNUNET_CONFIGURATION_destroy (cfg);
       return 1;
     }
-  if ((GNUNET_OK !=
-       GNUNET_CONFIGURATION_get_value_string (cfg, "TESTING", "WEAKRANDOM",
-                                             &c))
-      || (0 != strcmp (c, "YES")))
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (cfg, "TESTING", "WEAKRANDOM",
+                                            &c))
+    {
+      GNUNET_break (0);
+      GNUNET_CONFIGURATION_destroy (cfg);
+      return 1;
+    }
+  if (0 != strcmp (c, "YES"))
     {
       GNUNET_break (0);
+      GNUNET_free (c);
       GNUNET_CONFIGURATION_destroy (cfg);
       return 1;
     }
+
   GNUNET_free (c);
   GNUNET_CONFIGURATION_destroy (cfg);
 

diff --git a/src/util/test_container_slist.c b/src/util/test_container_slist.c
index ab19eb63877ef033a41558713795cf9b46cc5d57..a9523c9d2d5441ec397a4db8ebc16f563a5203ed 100644 (file)
--- a/src/util/test_container_slist.c
+++ b/src/util/test_container_slist.c
@@ -28,8 +28,7 @@
 #include "gnunet_common.h"
 #include "gnunet_container_lib.h"
 
-#define ABORT() { fprintf(stderr, "Error at %s:%d\n", __FILE__, __LINE__); return 1; }
-#define CHECK(c) { if (! (c)) ABORT(); }
+#define CHECK(c) do { if (! (c)) { fprintf(stderr, "Error at %s:%d\n", __FILE__, __LINE__); GNUNET_CONTAINER_slist_destroy (l); return 1; } } while (0)
 
 int
 main (int argc, char *argv[])