Increase FONT_MAXNO from 0x2f to 0x40, to ensure the fonts[] array

[u/mdw/putty] / proxy.c

diff --git a/proxy.c b/proxy.c
index 3c81884..70da38c 100644 (file)
--- a/proxy.c
+++ b/proxy.c
@@ -473,6 +473,7 @@ Socket new_connection(SockAddr addr, char *hostname,
                                   conf_get_int(conf, CONF_addressfamily));
        if (sk_addr_error(proxy_addr) != NULL) {
            ret->error = "Proxy error: Unable to resolve proxy host name";
+            sfree(pplug);
            return (Socket)ret;
        }
        sfree(proxy_canonical_name);
@@ -750,8 +751,7 @@ int proxy_socks4_negotiate (Proxy_Socket p, int change)
 
        type = sk_addrtype(p->remote_addr);
        if (type == ADDRTYPE_IPV6) {
-           plug_closing(p->plug, "Proxy error: SOCKS version 4 does"
-                        " not support IPv6", PROXY_ERROR_GENERAL, 0);
+            p->error = "Proxy error: SOCKS version 4 does not support IPv6";
            return 1;
        } else if (type == ADDRTYPE_IPV4) {
            namelen = 0;