Do not crash if key is NULL.

[oweals/gnunet.git] / src / fs / test_fs_search.c

diff --git a/src/fs/test_fs_search.c b/src/fs/test_fs_search.c
index 9a6ba90a405858b23ef895ba99d0fadcc4a5d475..f525fb474a1114e5c008ee79fc0973fb4b9b4350 100644 (file)
--- a/src/fs/test_fs_search.c
+++ b/src/fs/test_fs_search.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2004, 2005, 2006, 2008, 2009 Christian Grothoff (and other contributing authors)
+     (C) 2004-2013 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -24,7 +24,7 @@
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
 #include "gnunet_fs_service.h"
 
 
@@ -52,21 +52,55 @@ static struct GNUNET_FS_SearchContext *search;
 
 static struct GNUNET_FS_PublishContext *publish;
 
+static GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+
+static int err;
+
 
 static void
 abort_publish_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_FS_publish_stop (publish);
-  publish = NULL;
+  if (NULL != publish)
+  {
+    GNUNET_FS_publish_stop (publish);
+    publish = NULL;
+  }
+  if (GNUNET_SCHEDULER_NO_TASK != timeout_task)
+  {
+    GNUNET_SCHEDULER_cancel (timeout_task);
+    timeout_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+}
+
+
+static void
+abort_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  fprintf (stderr,
+          "Timeout\n");
+  timeout_task = GNUNET_SCHEDULER_NO_TASK;
+  if (NULL != search)
+  {
+    GNUNET_FS_search_stop (search);
+    search = NULL;
+  }
+  if (NULL != publish)
+  {
+    GNUNET_FS_publish_stop (publish);
+    publish = NULL;
+  }
+  err = 1;
 }
 
 
 static void
 abort_search_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  if (search != NULL)
+  if (NULL != search)
+  {
     GNUNET_FS_search_stop (search);
-  search = NULL;
+    search = NULL;
+  }
 }
 
 
@@ -89,6 +123,8 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
                (unsigned long long) event->value.publish.specifics.
                progress.offset);
     break;
+  case GNUNET_FS_STATUS_PUBLISH_PROGRESS_DIRECTORY:
+    break;
   case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
     kuri = GNUNET_FS_uri_ksk_create_from_args (1, keywords);
     start = GNUNET_TIME_absolute_get ();
@@ -190,6 +226,8 @@ run (void *cls,
       GNUNET_FS_publish_start (fs, fi, NULL, NULL, NULL,
                                GNUNET_FS_PUBLISH_OPTION_NONE);
   GNUNET_assert (publish != NULL);
+  timeout_task = GNUNET_SCHEDULER_add_delayed (LIFETIME,
+                                              &abort_error, NULL);
 }
 
 
@@ -200,7 +238,7 @@ main (int argc, char *argv[])
                                    "test_fs_search_data.conf",
                                    &run, NULL))
     return 1;
-  return 0;
+  return err;
 }
 
 /* end of test_fs_search.c */