3 files changed, 6 insertions, 3 deletions

diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h
index b8e0cf3f7..39b356fa0 100644
--- a/src/include/gnunet_testbed_service.h
+++ b/src/include/gnunet_testbed_service.h
@@ -1127,7 +1127,8 @@ GNUNET_TESTBED_destroy (struct GNUNET_TESTBED_Testbed *testbed);
  * @param host_filename name of the file with the 'hosts', NULL
  *        to run everything on 'localhost'
  * @param cfg configuration to use (for testbed, controller and peers)
- * @param num_peers number of peers to start; FIXME: maybe put that ALSO into cfg?
+ * @param num_peers number of peers to start; FIXME: maybe put that ALSO into
+ *        cfg?; should be greater than 0
  * @param event_mask bit mask with set of events to call 'cc' for;
  *                   or-ed values of "1LL" shifted by the
  *                   respective 'enum GNUNET_TESTBED_EventType'
@@ -1182,7 +1183,7 @@ typedef void (*GNUNET_TESTBED_TestMaster)(void *cls,
  * @param testname name of the testcase (to configure logging, etc.)
  * @param cfg_filename configuration filename to use
  *              (for testbed, controller and peers)
- * @param num_peers number of peers to start
+ * @param num_peers number of peers to start; should be greter than 0
  * @param test_master task to run once the test is ready
  * @param test_master_cls closure for 'task'.
  */
diff --git a/src/testbed/testbed_api_test.c b/src/testbed/testbed_api_test.c
index 1d49e706d..c040e1c79 100644
--- a/src/testbed/testbed_api_test.c
+++ b/src/testbed/testbed_api_test.c
@@ -159,6 +159,7 @@ GNUNET_TESTBED_test_run (const char *testname, const char *cfg_filename,
   argv2[0] = GNUNET_strdup (testname);
   argv2[2] = GNUNET_strdup (cfg_filename);
   GNUNET_assert (NULL != test_master);
+  GNUNET_assert (num_peers > 0);
   rc = GNUNET_malloc (sizeof (struct TestRunContext) +
                       (num_peers * sizeof (struct GNUNET_TESTBED_Peer *)));
   rc->test_master = test_master;
diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c
index 6fa5d6dd4..6e6145aaa 100644
--- a/src/testbed/testbed_api_testbed.c
+++ b/src/testbed/testbed_api_testbed.c
@@ -483,11 +483,12 @@ GNUNET_TESTBED_run (const char *host_filename,
 {
   struct RunContext *rc;
 
-  rc = GNUNET_malloc (sizeof (struct RunContext));
   GNUNET_break (NULL == host_filename); /* Currently we do not support host
                                          * files */
   GNUNET_assert (NULL != cc);
+  GNUNET_assert (num_peers > 0);
   host_filename = NULL;
+  rc = GNUNET_malloc (sizeof (struct RunContext));
   rc->h = GNUNET_TESTBED_host_create (NULL, NULL, 0);
   GNUNET_assert (NULL != rc->h);
   rc->cproc =