--- libaitsched/src/aitsched.c	2012/05/03 15:05:09	1.6.2.4
+++ libaitsched/src/aitsched.c	2012/05/10 15:30:18	1.6.2.5
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsched.c,v 1.6.2.4 2012/05/03 15:05:09 misho Exp $
+* $Id: aitsched.c,v 1.6.2.5 2012/05/10 15:30:18 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -190,7 +190,7 @@ schedInit(void ** __restrict data, size_t datlen)
 int
 schedEnd(sched_root_task_t ** __restrict root)
 {
-	sched_task_t *task;
+	sched_task_t *task, *tmp;
 #ifdef HAVE_LIBPTHREAD
 	register int i;
 #endif
@@ -198,22 +198,22 @@ schedEnd(sched_root_task_t ** __restrict root)
 	if (!root || !*root)
 		return -1;
 
-	TAILQ_FOREACH(task, &(*root)->root_read, task_node) {
+	TAILQ_FOREACH_SAFE(task, &(*root)->root_read, task_node, tmp) {
 		schedCancel(task);
 	}
-	TAILQ_FOREACH(task, &(*root)->root_write, task_node) {
+	TAILQ_FOREACH_SAFE(task, &(*root)->root_write, task_node, tmp) {
 		schedCancel(task);
 	}
-	TAILQ_FOREACH(task, &(*root)->root_timer, task_node) {
+	TAILQ_FOREACH_SAFE(task, &(*root)->root_timer, task_node, tmp) {
 		schedCancel(task);
 	}
-	TAILQ_FOREACH(task, &(*root)->root_event, task_node) {
+	TAILQ_FOREACH_SAFE(task, &(*root)->root_event, task_node, tmp) {
 		schedCancel(task);
 	}
-	TAILQ_FOREACH(task, &(*root)->root_eventlo, task_node) {
+	TAILQ_FOREACH_SAFE(task, &(*root)->root_eventlo, task_node, tmp) {
 		schedCancel(task);
 	}
-	TAILQ_FOREACH(task, &(*root)->root_ready, task_node) {
+	TAILQ_FOREACH_SAFE(task, &(*root)->root_ready, task_node, tmp) {
 		schedCancel(task);
 	}