diff options
Diffstat (limited to 'clientloop.c')
| -rw-r--r-- | clientloop.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/clientloop.c b/clientloop.c index 3fb72fb2fd7e..99846a978397 100644 --- a/clientloop.c +++ b/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.390 2023/03/08 04:43:12 guenther Exp $ */ +/* $OpenBSD: clientloop.c,v 1.392 2023/04/03 08:10:54 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1005,14 +1005,12 @@ process_escapes(struct ssh *ssh, Channel *c, u_int i; u_char ch; char *s; - struct escape_filter_ctx *efc = c->filter_ctx == NULL ? - NULL : (struct escape_filter_ctx *)c->filter_ctx; + struct escape_filter_ctx *efc; - if (c->filter_ctx == NULL) + if (c == NULL || c->filter_ctx == NULL || len <= 0) return 0; - if (len <= 0) - return (0); + efc = (struct escape_filter_ctx *)c->filter_ctx; for (i = 0; i < (u_int)len; i++) { /* Get one character at a time. */ @@ -1109,7 +1107,7 @@ process_escapes(struct ssh *ssh, Channel *c, continue; case '&': - if (c && c->ctl_chan != -1) + if (c->ctl_chan != -1) goto noescape; /* * Detach the program (continue to serve @@ -2270,7 +2268,7 @@ key_accepted_by_hostkeyalgs(const struct sshkey *key) const char *ktype = sshkey_ssh_name(key); const char *hostkeyalgs = options.hostkeyalgorithms; - if (key == NULL || key->type == KEY_UNSPEC) + if (key->type == KEY_UNSPEC) return 0; if (key->type == KEY_RSA && (match_pattern_list("rsa-sha2-256", hostkeyalgs, 0) == 1 || |