From: Rich Salz <rsalz@akamai.com>
Date: Mon, 25 May 2015 15:13:28 +0000 (-0400)
Subject: fix s_client crash
X-Git-Tag: OpenSSL_1_1_0-pre1~1086
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=fc0eb00bca9dd892592edb6367927186928a7e1a;ds=inline

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>
---

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)) {