Add NULL checks for clients that may not have identified yet, GitHub

issue 5663.

(cherry picked from commit 4a98a9dea8)
This commit is contained in:
nicm
2026-09-29 14:12:21 +00:00
committed by Nicholas Marriott
parent 324ac927d6
commit 9e913fd398

View File

@@ -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 <nicholas.marriott@gmail.com> * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1644,7 +1644,7 @@ format_cb_client_last_session(struct format_tree *ft)
static void * static void *
format_cb_client_name(struct format_tree *ft) 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 (xstrdup(ft->c->name));
return (NULL); return (NULL);
} }
@@ -1707,7 +1707,7 @@ format_cb_client_termfeatures(struct format_tree *ft)
static void * static void *
format_cb_client_termname(struct format_tree *ft) 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 (xstrdup(ft->c->term_name));
return (NULL); return (NULL);
} }
@@ -1728,7 +1728,7 @@ format_cb_client_termtype(struct format_tree *ft)
static void * static void *
format_cb_client_tty(struct format_tree *ft) 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 (xstrdup(ft->c->ttyname));
return (NULL); return (NULL);
} }