diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-10-15 01:56:45 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-10-15 01:56:45 +0000 |
| commit | 8085adb8a2129098d71a159abb8bd42074badb91 (patch) | |
| tree | 2e8a866e00e579618336cafa5d9cb034d839d133 | |
| parent | 3d88da7b2afbd24bf62259bb7f2f53ccf29f8379 (diff) | |
| download | rtmux-8085adb8a2129098d71a159abb8bd42074badb91.tar.gz rtmux-8085adb8a2129098d71a159abb8bd42074badb91.tar.bz2 rtmux-8085adb8a2129098d71a159abb8bd42074badb91.zip | |
Sync OpenBSD patchset 411:
cmd_find_client shouldn't die when there is an empty slot in the clients
array. DOH.
| -rw-r--r-- | cmd.c | 17 |
1 files changed, 9 insertions, 8 deletions
@@ -1,4 +1,4 @@ -/* $Id: cmd.c,v 1.124 2009-10-14 13:22:24 nicm Exp $ */ +/* $Id: cmd.c,v 1.125 2009-10-15 01:56:45 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -398,7 +398,7 @@ cmd_newest_client(void) struct client * cmd_find_client(struct cmd_ctx *ctx, const char *arg) { - struct client *c; + struct client *c, *lastc; struct session *s; char *tmparg; size_t arglen; @@ -414,16 +414,17 @@ cmd_find_client(struct cmd_ctx *ctx, const char *arg) */ s = cmd_current_session(ctx); if (s != NULL) { - c = NULL; + lastc = NULL; for (i = 0; i < ARRAY_LENGTH(&clients); i++) { - if (ARRAY_ITEM(&clients, i)->session == s) { - if (c != NULL) + c = ARRAY_ITEM(&clients, i); + if (c != NULL && c->session == s) { + if (lastc != NULL) break; - c = ARRAY_ITEM(&clients, i); + lastc = c; } } - if (i == ARRAY_LENGTH(&clients) && c != NULL) - return (c); + if (i == ARRAY_LENGTH(&clients) && lastc != NULL) + return (lastc); } return (cmd_newest_client()); } |