From 9e913fd3989abe81d7f990249f0a163b158124de Mon Sep 17 00:00:00 2001 From: nicm Date: Tue, 29 Sep 2026 14:12:21 +0000 Subject: [PATCH] Add NULL checks for clients that may not have identified yet, GitHub issue 5663. (cherry picked from commit 4a98a9dea80b4821449d5c1857040f3afdc507f2) --- format.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/format.c b/format.c index b29675a97..97bcc4bfc 100644 --- a/format.c +++ b/format.c @@ -1,4 +1,4 @@ -/* $OpenBSD: format.c,v 1.423 2026/09/29 13:59:10 nicm Exp $ */ +/* $OpenBSD: format.c,v 1.424 2026/09/29 14:12:21 nicm Exp $ */ /* * Copyright (c) 2011 Nicholas Marriott @@ -1644,7 +1644,7 @@ format_cb_client_last_session(struct format_tree *ft) static void * format_cb_client_name(struct format_tree *ft) { - if (ft->c != NULL) + if (ft->c != NULL && ft->c->name != NULL) return (xstrdup(ft->c->name)); return (NULL); } @@ -1707,7 +1707,7 @@ format_cb_client_termfeatures(struct format_tree *ft) static void * format_cb_client_termname(struct format_tree *ft) { - if (ft->c != NULL) + if (ft->c != NULL && ft->c->term_name != NULL) return (xstrdup(ft->c->term_name)); return (NULL); } @@ -1728,7 +1728,7 @@ format_cb_client_termtype(struct format_tree *ft) static void * format_cb_client_tty(struct format_tree *ft) { - if (ft->c != NULL) + if (ft->c != NULL && ft->c->ttyname != NULL) return (xstrdup(ft->c->ttyname)); return (NULL); }