cmd_find_client shouldn't die when there is an empty slot in the clients

array. DOH.
This commit is contained in:
Nicholas Marriott 2009-10-14 20:52:28 +00:00
parent adad557499
commit 1a3c334c75

15
cmd.c
View File

@ -399,7 +399,7 @@ cmd_newest_client(void)
struct client * struct client *
cmd_find_client(struct cmd_ctx *ctx, const char *arg) cmd_find_client(struct cmd_ctx *ctx, const char *arg)
{ {
struct client *c; struct client *c, *lastc;
struct session *s; struct session *s;
char *tmparg; char *tmparg;
size_t arglen; size_t arglen;
@ -415,16 +415,17 @@ cmd_find_client(struct cmd_ctx *ctx, const char *arg)
*/ */
s = cmd_current_session(ctx); s = cmd_current_session(ctx);
if (s != NULL) { if (s != NULL) {
c = NULL; lastc = NULL;
for (i = 0; i < ARRAY_LENGTH(&clients); i++) { for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
if (ARRAY_ITEM(&clients, i)->session == s) { c = ARRAY_ITEM(&clients, i);
if (c != NULL) if (c != NULL && c->session == s) {
if (lastc != NULL)
break; break;
c = ARRAY_ITEM(&clients, i); lastc = c;
} }
} }
if (i == ARRAY_LENGTH(&clients) && c != NULL) if (i == ARRAY_LENGTH(&clients) && lastc != NULL)
return (c); return (lastc);
} }
return (cmd_newest_client()); return (cmd_newest_client());
} }