From 7ffdbc1adcc37edecd9737e9b59de3d73b2e7901 Mon Sep 17 00:00:00 2001 From: simon Date: Wed, 23 Apr 2003 13:48:09 +0000 Subject: [PATCH] Unix makefile now uses -O2, which massively cuts down key exchange time. This gives rise to a whole bunch of spare warnings, one or two of which might have been actual bugs; now all resolved. git-svn-id: svn://svn.tartarus.org/sgt/putty@3134 cda61777-01e9-0310-a592-d414129be87e --- mkfiles.pl | 2 +- proxy.c | 3 +- ssh.c | 106 +++++++++++++++++++++++++++++--------------------------- terminal.c | 4 +-- unix/gtkdlg.c | 2 ++ unix/gtkpanel.c | 4 +-- unix/pterm.c | 5 +-- unix/ux_x11.c | 3 +- 8 files changed, 68 insertions(+), 61 deletions(-) diff --git a/mkfiles.pl b/mkfiles.pl index 438495b0..422b8b0e 100755 --- a/mkfiles.pl +++ b/mkfiles.pl @@ -545,7 +545,7 @@ print "# TOOLPATH = /opt/gcc/bin\n". "CC = \$(TOOLPATH)cc\n". "\n". -&splitline("CFLAGS = -Wall -Werror -g -I. -I.. -I../charset `gtk-config --cflags`")."\n". +&splitline("CFLAGS = -O2 -Wall -Werror -g -I. -I.. -I../charset `gtk-config --cflags`")."\n". "XLDFLAGS = `gtk-config --libs`\n". "ULDFLAGS =#\n". "INSTALL=install\n", diff --git a/proxy.c b/proxy.c index cda7511d..2ea0bc8c 100644 --- a/proxy.c +++ b/proxy.c @@ -269,7 +269,8 @@ static int proxy_for_destination (SockAddr addr, char *hostname, int port, if (addr) { sk_getaddr(addr, hostip, 64); hostip_len = strlen(hostip); - } + } else + hostip_len = 0; /* placate gcc; shouldn't be required */ hostname_len = strlen(hostname); diff --git a/ssh.c b/ssh.c index a0041767..6abdb288 100644 --- a/ssh.c +++ b/ssh.c @@ -842,7 +842,7 @@ static int ssh1_rdpkt(Ssh ssh, unsigned char **data, int *datalen) if (ssh->cipher && detect_attack(ssh->crcda_ctx, ssh->pktin.data, st->biglen, NULL)) { bombout(("Network attack (CRC compensation) detected!")); - crReturn(0); + crStop(0); } if (ssh->cipher) @@ -852,7 +852,7 @@ static int ssh1_rdpkt(Ssh ssh, unsigned char **data, int *datalen) st->gotcrc = GET_32BIT(ssh->pktin.data + st->biglen - 4); if (st->gotcrc != st->realcrc) { bombout(("Incorrect CRC received on packet")); - crReturn(0); + crStop(0); } ssh->pktin.body = ssh->pktin.data + st->pad + 1; @@ -893,7 +893,7 @@ static int ssh1_rdpkt(Ssh ssh, unsigned char **data, int *datalen) long stringlen = GET_32BIT(ssh->pktin.body); if (stringlen + 4 != ssh->pktin.length) { bombout(("Received data packet with bogus string length")); - crReturn(0); + crStop(0); } } @@ -926,7 +926,7 @@ static int ssh1_rdpkt(Ssh ssh, unsigned char **data, int *datalen) buf[nowlen + msglen] = '\0'; /* logevent(buf); (this is now done within the bombout macro) */ bombout(("Server sent disconnect message:\n\"%s\"", buf+nowlen)); - crReturn(0); + crStop(0); } crFinish(0); @@ -981,7 +981,7 @@ static int ssh2_rdpkt(Ssh ssh, unsigned char **data, int *datalen) */ if (st->len < 0 || st->pad < 0 || st->len + st->pad < 0) { bombout(("Incoming packet was garbled on decryption")); - crReturn(0); + crStop(0); } /* @@ -1030,7 +1030,7 @@ static int ssh2_rdpkt(Ssh ssh, unsigned char **data, int *datalen) && !ssh->scmac->verify(ssh->sc_mac_ctx, ssh->pktin.data, st->len + 4, st->incoming_sequence)) { bombout(("Incorrect MAC received on packet")); - crReturn(0); + crStop(0); } st->incoming_sequence++; /* whether or not we MACed */ @@ -1094,7 +1094,7 @@ static int ssh2_rdpkt(Ssh ssh, unsigned char **data, int *datalen) ssh2_disconnect_reasons[reason] : "unknown", buf+nowlen)); sfree(buf); - crReturn(0); + crStop(0); } break; case SSH2_MSG_IGNORE: @@ -1938,11 +1938,11 @@ static int do_ssh_init(Ssh ssh, unsigned char c) if (ssh->cfg.sshprot == 0 && !s->proto1) { bombout(("SSH protocol version 1 required by user but not provided by server")); - crReturn(0); + crStop(0); } if (ssh->cfg.sshprot == 3 && !s->proto2) { bombout(("SSH protocol version 2 required by user but not provided by server")); - crReturn(0); + crStop(0); } if (s->proto2 && (ssh->cfg.sshprot >= 2 || !s->proto1)) { @@ -2301,7 +2301,7 @@ static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen, int ispkt) if (ssh->pktin.type != SSH1_SMSG_PUBLIC_KEY) { bombout(("Public key packet not received")); - crReturn(0); + crStop(0); } logevent("Received public keys"); @@ -2415,7 +2415,7 @@ static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen, int ispkt) else /* shouldn't happen */ bombout(("No supported ciphers found")); - crReturn(0); + crStop(0); } /* Warn about chosen cipher if necessary. */ @@ -2460,7 +2460,7 @@ static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen, int ispkt) if (ssh->pktin.type != SSH1_SMSG_SUCCESS) { bombout(("Encryption not successfully enabled")); - crReturn(0); + crStop(0); } logevent("Successfully started encryption"); @@ -2477,7 +2477,7 @@ static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen, int ispkt) */ logevent("No username provided. Abandoning session."); ssh_closing((Plug)ssh, NULL, 0, 0); - crReturn(1); + crStop(1); } } else { int ret; /* need not be kept over crReturn */ @@ -2755,7 +2755,7 @@ static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen, int ispkt) logevent("Unable to authenticate"); connection_fatal(ssh->frontend, "Unable to authenticate"); ssh_closing((Plug)ssh, NULL, 0, 0); - crReturn(1); + crStop(1); } } else { /* Prompt may have come from server. We've munged it a bit, so @@ -2810,7 +2810,7 @@ static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen, int ispkt) } if (ssh->pktin.type != SSH1_SMSG_AUTH_RSA_CHALLENGE) { bombout(("Bizarre response to offer of public key")); - crReturn(0); + crStop(0); } { @@ -2846,7 +2846,7 @@ static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen, int ispkt) continue; /* go and try password */ } else if (ssh->pktin.type != SSH1_SMSG_SUCCESS) { bombout(("Bizarre response to RSA authentication response")); - crReturn(0); + crStop(0); } break; /* we're through! */ @@ -2979,7 +2979,7 @@ static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen, int ispkt) logevent("Authentication refused"); } else if (ssh->pktin.type != SSH1_SMSG_SUCCESS) { bombout(("Strange packet received, type %d", ssh->pktin.type)); - crReturn(0); + crStop(0); } } @@ -3079,7 +3079,7 @@ static void ssh1_protocol(Ssh ssh, unsigned char *in, int inlen, int ispkt) if (ssh->pktin.type != SSH1_SMSG_SUCCESS && ssh->pktin.type != SSH1_SMSG_FAILURE) { bombout(("Protocol confusion")); - crReturnV; + crStopV; } else if (ssh->pktin.type == SSH1_SMSG_FAILURE) { logevent("Agent forwarding refused"); } else { @@ -3109,7 +3109,7 @@ static void ssh1_protocol(Ssh ssh, unsigned char *in, int inlen, int ispkt) if (ssh->pktin.type != SSH1_SMSG_SUCCESS && ssh->pktin.type != SSH1_SMSG_FAILURE) { bombout(("Protocol confusion")); - crReturnV; + crStopV; } else if (ssh->pktin.type == SSH1_SMSG_FAILURE) { logevent("X11 forwarding refused"); } else { @@ -3177,7 +3177,7 @@ static void ssh1_protocol(Ssh ssh, unsigned char *in, int inlen, int ispkt) } } else { while (*ssh->portfwd_strptr) ssh->portfwd_strptr++; - dport = -1; + dport = dserv = -1; } sport = atoi(sports); sserv = 0; @@ -3245,7 +3245,7 @@ static void ssh1_protocol(Ssh ssh, unsigned char *in, int inlen, int ispkt) if (ssh->pktin.type != SSH1_SMSG_SUCCESS && ssh->pktin.type != SSH1_SMSG_FAILURE) { bombout(("Protocol confusion")); - crReturnV; + crStopV; } else if (ssh->pktin.type == SSH1_SMSG_FAILURE) { c_write_str(ssh, "Server refused port" " forwarding\r\n"); @@ -3270,7 +3270,7 @@ static void ssh1_protocol(Ssh ssh, unsigned char *in, int inlen, int ispkt) if (ssh->pktin.type != SSH1_SMSG_SUCCESS && ssh->pktin.type != SSH1_SMSG_FAILURE) { bombout(("Protocol confusion")); - crReturnV; + crStopV; } else if (ssh->pktin.type == SSH1_SMSG_FAILURE) { c_write_str(ssh, "Server refused to allocate pty\r\n"); ssh->editing = ssh->echoing = 1; @@ -3288,7 +3288,7 @@ static void ssh1_protocol(Ssh ssh, unsigned char *in, int inlen, int ispkt) if (ssh->pktin.type != SSH1_SMSG_SUCCESS && ssh->pktin.type != SSH1_SMSG_FAILURE) { bombout(("Protocol confusion")); - crReturnV; + crStopV; } else if (ssh->pktin.type == SSH1_SMSG_FAILURE) { c_write_str(ssh, "Server refused to compress\r\n"); } @@ -3348,7 +3348,7 @@ static void ssh1_protocol(Ssh ssh, unsigned char *in, int inlen, int ispkt) } else if (ssh->pktin.type == SSH1_MSG_DISCONNECT) { ssh_closing((Plug)ssh, NULL, 0, 0); logevent("Received disconnect request"); - crReturnV; + crStopV; } else if (ssh->pktin.type == SSH1_SMSG_X11_OPEN) { /* Remote side is trying to open a channel to talk to our * X-Server. Give them back a local channel number. */ @@ -3542,6 +3542,7 @@ static void ssh1_protocol(Ssh ssh, unsigned char *in, int inlen, int ispkt) ssh->pktin.type == SSH1_MSG_CHANNEL_CLOSE ? "" : "_CONFIRMATION", c ? "half-open" : "nonexistent", i)); + crStopV; } } else if (ssh->pktin.type == SSH1_MSG_CHANNEL_DATA) { /* Data sent down one of our channels. */ @@ -3551,7 +3552,7 @@ static void ssh1_protocol(Ssh ssh, unsigned char *in, int inlen, int ispkt) struct ssh_channel *c; c = find234(ssh->channels, &i, ssh_channelfind); if (c) { - int bufsize; + int bufsize = 0; switch (c->type) { case CHAN_X11: bufsize = x11_send(c->u.x11.s, (char *)p, len); @@ -3639,10 +3640,10 @@ static void ssh1_protocol(Ssh ssh, unsigned char *in, int inlen, int ispkt) * we've sent EXIT_CONFIRMATION. */ ssh_closing((Plug)ssh, NULL, 0, 0); - crReturnV; + crStopV; } else { bombout(("Strange packet received: type %d", ssh->pktin.type)); - crReturnV; + crStopV; } } else { while (inlen > 0) { @@ -3915,7 +3916,7 @@ static int do_ssh2_transport(Ssh ssh, unsigned char *in, int inlen, int ispkt) if (ssh->pktin.type != SSH2_MSG_KEXINIT) { bombout(("expected key exchange packet from server")); - crReturn(0); + crStop(0); } ssh->kex = NULL; ssh->hostkey = NULL; @@ -3966,7 +3967,7 @@ static int do_ssh2_transport(Ssh ssh, unsigned char *in, int inlen, int ispkt) if (!s->cscipher_tobe) { bombout(("Couldn't agree a client-to-server cipher (available: %s)", str ? str : "(null)")); - crReturn(0); + crStop(0); } ssh2_pkt_getstring(ssh, &str, &len); /* server->client cipher */ @@ -3992,7 +3993,7 @@ static int do_ssh2_transport(Ssh ssh, unsigned char *in, int inlen, int ispkt) if (!s->sccipher_tobe) { bombout(("Couldn't agree a server-to-client cipher (available: %s)", str ? str : "(null)")); - crReturn(0); + crStop(0); } ssh2_pkt_getstring(ssh, &str, &len); /* client->server mac */ @@ -4065,7 +4066,7 @@ static int do_ssh2_transport(Ssh ssh, unsigned char *in, int inlen, int ispkt) crWaitUntil(ispkt); if (ssh->pktin.type != SSH2_MSG_KEX_DH_GEX_GROUP) { bombout(("expected key exchange group packet from server")); - crReturn(0); + crStop(0); } s->p = ssh2_pkt_getmp(ssh); s->g = ssh2_pkt_getmp(ssh); @@ -4091,7 +4092,7 @@ static int do_ssh2_transport(Ssh ssh, unsigned char *in, int inlen, int ispkt) crWaitUntil(ispkt); if (ssh->pktin.type != s->kex_reply_value) { bombout(("expected key exchange reply packet from server")); - crReturn(0); + crStop(0); } ssh2_pkt_getstring(ssh, &s->hostkeydata, &s->hostkeylen); s->f = ssh2_pkt_getmp(ssh); @@ -4123,7 +4124,7 @@ static int do_ssh2_transport(Ssh ssh, unsigned char *in, int inlen, int ispkt) !ssh->hostkey->verifysig(s->hkey, s->sigdata, s->siglen, (char *)s->exchange_hash, 20)) { bombout(("Server's host key did not match the signature supplied")); - crReturn(0); + crStop(0); } /* @@ -4155,7 +4156,7 @@ static int do_ssh2_transport(Ssh ssh, unsigned char *in, int inlen, int ispkt) crWaitUntil(ispkt); if (ssh->pktin.type != SSH2_MSG_NEWKEYS) { bombout(("expected new-keys packet from server")); - crReturn(0); + crStop(0); } /* @@ -4370,7 +4371,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt) crWaitUntilV(ispkt); if (ssh->pktin.type != SSH2_MSG_SERVICE_ACCEPT) { bombout(("Server refused user authentication protocol")); - crReturnV; + crStopV; } /* @@ -4419,7 +4420,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt) */ logevent("No username provided. Abandoning session."); ssh_closing((Plug)ssh, NULL, 0, 0); - crReturnV; + crStopV; } } else { int ret; /* need not be saved across crReturn */ @@ -4536,7 +4537,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt) } else if (ssh->pktin.type != SSH2_MSG_USERAUTH_FAILURE) { bombout(("Strange packet received during authentication: type %d", ssh->pktin.type)); - crReturnV; + crStopV; } s->gotit = FALSE; @@ -4933,7 +4934,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt) connection_fatal(ssh->frontend, "Unable to authenticate"); ssh_closing((Plug)ssh, NULL, 0, 0); - crReturnV; + crStopV; } } else { int ret; /* need not be saved across crReturn */ @@ -5122,7 +5123,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt) ssh2_pkt_addstring(ssh, "en"); /* language tag */ ssh2_pkt_send(ssh); ssh_closing((Plug)ssh, NULL, 0, 0); - crReturnV; + crStopV; } } } while (!s->we_are_in); @@ -5150,12 +5151,12 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt) crWaitUntilV(ispkt); if (ssh->pktin.type != SSH2_MSG_CHANNEL_OPEN_CONFIRMATION) { bombout(("Server refused to open a session")); - crReturnV; + crStopV; /* FIXME: error data comes back in FAILURE packet */ } if (ssh2_pkt_getuint32(ssh) != ssh->mainchan->localid) { bombout(("Server's channel confirmation cited wrong channel")); - crReturnV; + crStopV; } ssh->mainchan->remoteid = ssh2_pkt_getuint32(ssh); ssh->mainchan->type = CHAN_MAINSESSION; @@ -5201,7 +5202,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt) if (ssh->pktin.type != SSH2_MSG_CHANNEL_FAILURE) { bombout(("Unexpected response to X11 forwarding request:" " packet type %d", ssh->pktin.type)); - crReturnV; + crStopV; } logevent("X11 forwarding refused"); } else { @@ -5272,7 +5273,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt) } } else { while (*ssh->portfwd_strptr) ssh->portfwd_strptr++; - dport = -1; + dport = dserv = -1; } sport = atoi(sports); sserv = 0; @@ -5357,7 +5358,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt) bombout(("Unexpected response to port " "forwarding request: packet type %d", ssh->pktin.type)); - crReturnV; + crStopV; } logevent("Server refused this port forwarding"); } else { @@ -5396,7 +5397,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt) if (ssh->pktin.type != SSH2_MSG_CHANNEL_FAILURE) { bombout(("Unexpected response to agent forwarding request:" " packet type %d", ssh->pktin.type)); - crReturnV; + crStopV; } logevent("Agent forwarding refused"); } else { @@ -5439,7 +5440,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt) if (ssh->pktin.type != SSH2_MSG_CHANNEL_FAILURE) { bombout(("Unexpected response to pty request:" " packet type %d", ssh->pktin.type)); - crReturnV; + crStopV; } c_write_str(ssh, "Server refused to allocate pty\r\n"); ssh->editing = ssh->echoing = 1; @@ -5497,7 +5498,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt) if (ssh->pktin.type != SSH2_MSG_CHANNEL_FAILURE) { bombout(("Unexpected response to shell/command request:" " packet type %d", ssh->pktin.type)); - crReturnV; + crStopV; } /* * We failed to start the command. If this is the @@ -5511,7 +5512,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt) continue; } bombout(("Server refused to start a shell/command")); - crReturnV; + crStopV; } else { logevent("Started a shell/command"); } @@ -5548,7 +5549,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt) continue; /* extended but not stderr */ ssh2_pkt_getstring(ssh, &data, &length); if (data) { - int bufsize; + int bufsize = 0; c->v.v2.locwindow -= length; switch (c->type) { case CHAN_MAINSESSION: @@ -5650,6 +5651,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt) if (!c || ((int)c->remoteid) == -1) { bombout(("Received CHANNEL_CLOSE for %s channel %d\n", c ? "half-open" : "nonexistent", i)); + crStopV; } /* Do pre-close processing on the channel. */ switch (c->type) { @@ -5702,7 +5704,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt) ssh2_pkt_send(ssh); #endif ssh_closing((Plug)ssh, NULL, 0, 0); - crReturnV; + crStopV; } continue; /* remote sends close; ignore (FIXME) */ } else if (ssh->pktin.type == SSH2_MSG_CHANNEL_WINDOW_ADJUST) { @@ -5780,7 +5782,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt) ssh2_pkt_send(ssh); connection_fatal(ssh->frontend, "%s", buf); ssh_closing((Plug)ssh, NULL, 0, 0); - crReturnV; + crStopV; } /* @@ -5931,7 +5933,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt) } } else { bombout(("Strange packet received: type %d", ssh->pktin.type)); - crReturnV; + crStopV; } } else { /* diff --git a/terminal.c b/terminal.c index 23123f88..82a90deb 100644 --- a/terminal.c +++ b/terminal.c @@ -4520,7 +4520,7 @@ void term_key(Terminal *term, Key_Sym keysym, wchar_t *text, size_t tlen, case PK_END: xkey = 'E'; break; case PK_PAGEUP: xkey = 'I'; break; case PK_PAGEDOWN: xkey = 'G'; break; - default: break; /* else gcc warns `enum value not used' */ + default: xkey=0; break; /* else gcc warns `enum value not used'*/ } p += sprintf((char *) p, "\x1B%c", xkey); goto done; @@ -4533,7 +4533,7 @@ void term_key(Terminal *term, Key_Sym keysym, wchar_t *text, size_t tlen, case PK_END: code = 4; break; case PK_PAGEUP: code = 5; break; case PK_PAGEDOWN: code = 6; break; - default: break; /* else gcc warns `enum value not used' */ + default: code = 0; break; /* else gcc warns `enum value not used' */ } p += sprintf((char *) p, "\x1B[%d~", code); goto done; diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c index a961ba50..05b78938 100644 --- a/unix/gtkdlg.c +++ b/unix/gtkdlg.c @@ -489,6 +489,8 @@ int dlg_listbox_index(union control *ctrl, void *dlg) if (uc->menu) activeitem = gtk_menu_get_active(GTK_MENU(uc->menu)); + else + activeitem = NULL; /* unnecessarily placate gcc */ children = gtk_container_children(GTK_CONTAINER(uc->menu ? uc->menu : uc->list)); diff --git a/unix/gtkpanel.c b/unix/gtkpanel.c index 07ea8670..591c8608 100644 --- a/unix/gtkpanel.c +++ b/unix/gtkpanel.c @@ -287,9 +287,9 @@ void panels_add(Panels *panels, GtkWidget *child) void panels_switch_to(Panels *panels, GtkWidget *target) { - GtkWidget *child; + GtkWidget *child = NULL; GList *children; - gboolean changed; + gboolean changed = FALSE; g_return_if_fail(panels != NULL); g_return_if_fail(IS_PANELS(panels)); diff --git a/unix/pterm.c b/unix/pterm.c index 00c33efb..3bb9f6ba 100644 --- a/unix/pterm.c +++ b/unix/pterm.c @@ -442,6 +442,7 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data) /* By default, nothing is generated. */ end = start = 0; + special = FALSE; /* * If Alt is being released after typing an Alt+numberpad @@ -2669,7 +2670,7 @@ void dup_session_menuitem(GtkMenuItem *item, gpointer gdata) fork_and_exec_self(inst, pipefd[1], option, NULL); close(pipefd[0]); - i = 0; + i = ret = 0; while (i < size && (ret = write(pipefd[1], data + i, size - i)) > 0) i += ret; if (ret < 0) @@ -2689,7 +2690,7 @@ int read_dupsession_data(struct gui_data *inst, Config *cfg, char *arg) } data = snewn(size, char); - i = 0; + i = ret = 0; while (i < size && (ret = read(fd, data + i, size - i)) > 0) i += ret; if (ret < 0) { diff --git a/unix/ux_x11.c b/unix/ux_x11.c index 47d0ef5f..67c76f83 100644 --- a/unix/ux_x11.c +++ b/unix/ux_x11.c @@ -13,6 +13,7 @@ void platform_get_x11_auth(char *display, int *protocol, char *command; int maxsize = *datalen; char *localbuf; + int proto = -1; /* * Normally we should run `xauth list DISPLAYNAME'. However, @@ -36,7 +37,7 @@ void platform_get_x11_auth(char *display, int *protocol, * Read a line from stdin, and attempt to parse it into a * display name (ignored), auth protocol, and auth string. */ - int c, i, hexdigit, proto; + int c, i, hexdigit; char protoname[64]; /* Skip the display name. */ -- 2.11.0