diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-05-25 11:13:28 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-05-25 12:46:57 -0400 |
| commit | fc0eb00bca9dd892592edb6367927186928a7e1a (patch) | |
| tree | 3c5a5a908d4f0ef889ab5cbebcaa5a1732863c29 | |
| parent | 81fc390fd96ad9fae21cda919513fb696cd24028 (diff) | |
fix s_client crash
The 'http proxy' commit broke s_client default host/port value.
Thanks to Matt for the simplest fix.
Reviewed-by: Matt Caswell <matt@openssl.org>
| -rw-r--r-- | apps/s_client.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index 8c5412c626..6c14af0e27 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -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)) { |