summaryrefslogtreecommitdiff
path: root/clientloop.c
diff options
context:
space:
mode:
Diffstat (limited to 'clientloop.c')
-rw-r--r--clientloop.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/clientloop.c b/clientloop.c
index f2f474eab..60c9e879e 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: clientloop.c,v 1.255 2013/11/08 00:39:15 djm Exp $ */ 1/* $OpenBSD: clientloop.c,v 1.256 2013/11/20 20:54:10 deraadt Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -293,7 +293,7 @@ client_x11_display_valid(const char *display)
293 293
294 dlen = strlen(display); 294 dlen = strlen(display);
295 for (i = 0; i < dlen; i++) { 295 for (i = 0; i < dlen; i++) {
296 if (!isalnum(display[i]) && 296 if (!isalnum((u_char)display[i]) &&
297 strchr(SSH_X11_VALID_DISPLAY_CHARS, display[i]) == NULL) { 297 strchr(SSH_X11_VALID_DISPLAY_CHARS, display[i]) == NULL) {
298 debug("Invalid character '%c' in DISPLAY", display[i]); 298 debug("Invalid character '%c' in DISPLAY", display[i]);
299 return 0; 299 return 0;
@@ -893,7 +893,7 @@ process_cmdline(void)
893 cmd = s = read_passphrase("\r\nssh> ", RP_ECHO); 893 cmd = s = read_passphrase("\r\nssh> ", RP_ECHO);
894 if (s == NULL) 894 if (s == NULL)
895 goto out; 895 goto out;
896 while (isspace(*s)) 896 while (isspace((u_char)*s))
897 s++; 897 s++;
898 if (*s == '-') 898 if (*s == '-')
899 s++; /* Skip cmdline '-', if any */ 899 s++; /* Skip cmdline '-', if any */
@@ -947,7 +947,7 @@ process_cmdline(void)
947 goto out; 947 goto out;
948 } 948 }
949 949
950 while (isspace(*++s)) 950 while (isspace((u_char)*++s))
951 ; 951 ;
952 952
953 /* XXX update list of forwards in options */ 953 /* XXX update list of forwards in options */
@@ -1162,7 +1162,7 @@ process_escapes(Channel *c, Buffer *bin, Buffer *bout, Buffer *berr,
1162 "%cB\r\n", escape_char); 1162 "%cB\r\n", escape_char);
1163 buffer_append(berr, string, 1163 buffer_append(berr, string,
1164 strlen(string)); 1164 strlen(string));
1165 channel_request_start(session_ident, 1165 channel_request_start(c->self,
1166 "break", 0); 1166 "break", 0);
1167 packet_put_int(1000); 1167 packet_put_int(1000);
1168 packet_send(); 1168 packet_send();