From 8085adb8a2129098d71a159abb8bd42074badb91 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Thu, 15 Oct 2009 01:56:45 +0000 Subject: [PATCH] Sync OpenBSD patchset 411: cmd_find_client shouldn't die when there is an empty slot in the clients array. DOH. --- cmd.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/cmd.c b/cmd.c index ddc2d214..7eb9ba6c 100644 --- a/cmd.c +++ b/cmd.c @@ -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 @@ -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()); }