4 files changed, 16 insertions, 5 deletions

diff --git a/src/util/test_bio.c b/src/util/test_bio.c
index 6aa4bbe62..bd74baf52 100644
--- a/src/util/test_bio.c
+++ b/src/util/test_bio.c
@@ -58,6 +58,7 @@ test_normal_rw ()
   GNUNET_assert (GNUNET_OK ==
                  GNUNET_BIO_read_string (fileR, "Read string error",
                                          &readResultString, 200));
+  GNUNET_assert (NULL != readResultString);
   GNUNET_assert (0 == strcmp (TESTSTRING, readResultString));
   GNUNET_free (readResultString);
   GNUNET_assert (GNUNET_OK ==
diff --git a/src/util/test_container_heap.c b/src/util/test_container_heap.c
index bb5b68a72..091e42ce1 100644
--- a/src/util/test_container_heap.c
+++ b/src/util/test_container_heap.c
@@ -49,6 +49,7 @@ check ()
   struct GNUNET_CONTAINER_HeapNode *n6;
   struct GNUNET_CONTAINER_HeapNode *n7;
   struct GNUNET_CONTAINER_HeapNode *n8;
+  const char *r;
 
   myHeap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
   
@@ -101,14 +102,19 @@ check ()
   n6 = GNUNET_CONTAINER_heap_insert (myHeap, "30/200", 30);
   GNUNET_assert (5 == GNUNET_CONTAINER_heap_get_size (myHeap));
   GNUNET_CONTAINER_heap_remove_node (myHeap, n5);
+  r = GNUNET_CONTAINER_heap_remove_root (myHeap); /* n1 */
+  GNUNET_assert (NULL != r);
   GNUNET_assert (0 == strcmp ("11",
-                              GNUNET_CONTAINER_heap_remove_root (myHeap))); /* n1 */
+                              r));
   GNUNET_CONTAINER_heap_update_cost (myHeap, n6, 200);
   GNUNET_CONTAINER_heap_remove_node (myHeap, n3); 
+  r = GNUNET_CONTAINER_heap_remove_root (myHeap); /* n4 */
+  GNUNET_assert (NULL != r);
   GNUNET_assert (0 == strcmp ("50",
-                              GNUNET_CONTAINER_heap_remove_root (myHeap))); /* n4 */
-  GNUNET_assert (0 == strcmp ("30/200",
-                              GNUNET_CONTAINER_heap_remove_root (myHeap))); /* n6 */
+                              r));
+  r = GNUNET_CONTAINER_heap_remove_root (myHeap); /* n6 */
+  GNUNET_assert (NULL != r);
+  GNUNET_assert (0 == strcmp ("30/200", r));
   GNUNET_assert (0 == GNUNET_CONTAINER_heap_get_size (myHeap));
   
   GNUNET_CONTAINER_heap_destroy (myHeap);
diff --git a/src/util/test_crypto_rsa.c b/src/util/test_crypto_rsa.c
index 859d476b9..ca3f69c35 100644
--- a/src/util/test_crypto_rsa.c
+++ b/src/util/test_crypto_rsa.c
@@ -289,14 +289,17 @@ testCreateFromFile ()
   struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded p2;
 
   key = GNUNET_CRYPTO_rsa_key_create_from_file (KEYFILE);
+  GNUNET_assert (NULL != key);
   GNUNET_CRYPTO_rsa_key_get_public (key, &p1);
   GNUNET_CRYPTO_rsa_key_free (key);
-  key = GNUNET_CRYPTO_rsa_key_create_from_file (KEYFILE);
+  key = GNUNET_CRYPTO_rsa_key_create_from_file (KEYFILE); 
+  GNUNET_assert (NULL != key);
   GNUNET_CRYPTO_rsa_key_get_public (key, &p2);
   GNUNET_assert (0 == memcmp (&p1, &p2, sizeof (p1)));
   GNUNET_CRYPTO_rsa_key_free (key);
   GNUNET_assert (0 == UNLINK (KEYFILE));
   key = GNUNET_CRYPTO_rsa_key_create_from_file (KEYFILE);
+  GNUNET_assert (NULL != key);
   GNUNET_CRYPTO_rsa_key_get_public (key, &p2);
   GNUNET_assert (0 != memcmp (&p1, &p2, sizeof (p1)));
   GNUNET_CRYPTO_rsa_key_free (key);
diff --git a/src/util/test_service.c b/src/util/test_service.c
index 5524e3f7c..6c78a4eb9 100644
--- a/src/util/test_service.c
+++ b/src/util/test_service.c
@@ -229,6 +229,7 @@ start_stop_main (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Starting service using start method\n");
   sctx = GNUNET_SERVICE_start ("test_service", sched, cfg);
+  GNUNET_assert (NULL != sctx);
   runner (cls, sched, GNUNET_SERVICE_get_server (sctx), cfg);
   *ret = 0;
 }