Merge branch 'obsd-master'

1 files changed, 7 insertions, 0 deletions

diff --git a/control.c b/control.c
index 8ff7736f..05093d94 100644
--- a/control.c
+++ b/control.c
@@ -569,6 +569,13 @@ control_write_pending(struct client *c, struct control_pane *cp, size_t limit)
 	}
 
 	while (used != limit && !TAILQ_EMPTY(&cp->blocks)) {
+		if (control_check_age(c, wp, cp)) {
+			if (message != NULL)
+				evbuffer_free(message);
+			message = NULL;
+			break;
+		}
+
 		cb = TAILQ_FIRST(&cp->blocks);
 		if (cb->t < t)
 			age = t - cb->t;