Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2016-01-01 10:01:11 +00:00
commit 051cf5437a

View File

@ -547,7 +547,7 @@ status_message_set(struct client *c, const char *fmt, ...)
struct message_entry *msg, *msg1;
va_list ap;
int delay;
u_int first, limit;
u_int limit;
limit = options_get_number(global_options, "message-limit");
@ -564,10 +564,9 @@ status_message_set(struct client *c, const char *fmt, ...)
msg->msg = xstrdup(c->message_string);
TAILQ_INSERT_TAIL(&c->message_log, msg, entry);
first = c->message_next - limit;
TAILQ_FOREACH_SAFE(msg, &c->message_log, entry, msg1) {
if (msg->msg_num >= first)
continue;
if (msg->msg_num + limit >= c->message_next)
break;
free(msg->msg);
TAILQ_REMOVE(&c->message_log, msg, entry);
free(msg);