diff options
author | nicm <nicm> | 2021-12-06 10:08:42 +0000 |
---|---|---|
committer | nicm <nicm> | 2021-12-06 10:08:42 +0000 |
commit | 8fccbbb02673bed71676412f1a313093a39c48ff (patch) | |
tree | 301b6d6cfbc4125b29d02d7f8da2bac7c7b1ce3d | |
parent | 333cf6429ae16da6fb3892978ea450bc62c3e873 (diff) |
Do not dereference NULL window when resizing client, GitHub issue 2982.
-rw-r--r-- | resize.c | 2 | ||||
-rw-r--r-- | tty.c | 4 |
2 files changed, 5 insertions, 1 deletions
@@ -348,6 +348,8 @@ recalculate_size_skip_client(struct client *loop, __unused int type, * is not the current window - this is used for aggressive-resize. * Otherwise skip any session that doesn't contain the window. */ + if (loop->session->curw == NULL) + return (1); if (current) return (loop->session->curw->window != w); return (session_has(loop->session, w) == 0); @@ -937,7 +937,9 @@ tty_update_window_offset(struct window *w) struct client *c; TAILQ_FOREACH(c, &clients, entry) { - if (c->session != NULL && c->session->curw->window == w) + if (c->session != NULL && + c->session->curw != NULL && + c->session->curw->window == w) tty_update_client_offset(c); } } |