Commit fc0eb00b authored by Rich Salz's avatar Rich Salz Committed by Rich Salz
Browse files

fix s_client crash 



The 'http proxy' commit broke s_client default host/port value.
Thanks to Matt for the simplest fix.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent 81fc390f

apps/s_client.c

+4 −3
Original line number Diff line number Diff line
@@ -635,8 +635,8 @@ int s_client_main(int argc, char **argv) 
    char *CApath = NULL, *CAfile = NULL, *cbuf = NULL, *sbuf = NULL;

    char *mbuf = NULL, *proxystr = NULL, *connectstr = NULL;

    char *cert_file = NULL, *key_file = NULL, *chain_file = NULL, *prog;

    char *chCApath = NULL, *chCAfile = NULL, *host = SSL_HOST_NAME, *inrand =

        NULL;

    char *chCApath = NULL, *chCAfile = NULL, *host = SSL_HOST_NAME;

    char *inrand = NULL;

    char *passarg = NULL, *pass = NULL, *vfyCApath = NULL, *vfyCAfile = NULL;

    char *sess_in = NULL, *sess_out = NULL, *crl_file = NULL, *p;

    char *jpake_secret = NULL, *xmpphost = NULL;
@@ -1067,7 +1067,8 @@ int s_client_main(int argc, char **argv) 
        if (!extract_host_port(proxystr, &host, NULL, &port))

            goto end;

    }

    else if (!extract_host_port(connectstr, &host, NULL, &port))

    else if (connectstr != NULL

            && !extract_host_port(connectstr, &host, NULL, &port))

        goto end;



    if (unix_path && (socket_type != SOCK_STREAM)) {