From 06d27e94b25a49f7a9824e8bfdf6fb04f6baf46e Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Wed, 11 Jul 2012 19:30:01 +0000 Subject: [PATCH] Sync OpenBSD patchset 1149: Move a NULL check inside a function, from Tiago Cunha. --- status.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/status.c b/status.c index 2a419bb2..9fea2804 100644 --- a/status.c +++ b/status.c @@ -515,6 +515,9 @@ status_replace(struct client *c, struct session *s, struct winlink *wl, char in[BUFSIZ], ch, *iptr, *optr; size_t len; + if (fmt == NULL) + return (xstrdup("")); + len = strftime(in, sizeof in, fmt, localtime(&t)); in[len] = '\0'; @@ -877,8 +880,6 @@ status_prompt_set(struct client *c, const char *msg, const char *input, c->prompt_string = status_replace(c, NULL, NULL, NULL, msg, time(NULL), 0); - if (input == NULL) - input = ""; c->prompt_buffer = status_replace(c, NULL, NULL, NULL, input, time(NULL), 0); c->prompt_index = strlen(c->prompt_buffer); @@ -932,8 +933,6 @@ status_prompt_update(struct client *c, const char *msg, const char *input) time(NULL), 0); xfree(c->prompt_buffer); - if (input == NULL) - input = ""; c->prompt_buffer = status_replace(c, NULL, NULL, NULL, input, time(NULL), 0); c->prompt_index = strlen(c->prompt_buffer);