diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2010-10-09 14:31:14 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2010-10-09 14:31:14 +0000 |
| commit | 6c9269baa784f7d9260cbcddab80e68a64298a56 (patch) | |
| tree | 359baff711cf2a01450d3d30155ee6a789be167c | |
| parent | 45784bd5d604e9cef869551ba66c0b3c66b894a2 (diff) | |
| download | rtmux-6c9269baa784f7d9260cbcddab80e68a64298a56.tar.gz rtmux-6c9269baa784f7d9260cbcddab80e68a64298a56.tar.bz2 rtmux-6c9269baa784f7d9260cbcddab80e68a64298a56.zip | |
Sync OpenBSD patchset 769:
Skip NULL entries in the sessions list when choosing the next session,
from Simon Olofsson.
| -rw-r--r-- | server-fn.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server-fn.c b/server-fn.c index ffdaa934..eb0f2bda 100644 --- a/server-fn.c +++ b/server-fn.c @@ -1,4 +1,4 @@ -/* $Id: server-fn.c,v 1.111 2010-10-09 14:29:32 tcunha Exp $ */ +/* $Id: server-fn.c,v 1.112 2010-10-09 14:31:14 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -368,7 +368,7 @@ server_next_session(struct session *s) s_out = NULL; for (i = 0; i < ARRAY_LENGTH(&sessions); i++) { s_loop = ARRAY_ITEM(&sessions, i); - if (s_loop == s) + if (s_loop == NULL || s_loop == s) continue; if (s_out == NULL || timercmp(&s_loop->activity_time, &s_out->activity_time, <)) |