From: Matt Caswell <matt@openssl.org>
Date: Fri, 7 Jul 2017 14:51:02 +0000 (+0100)
Subject: Fix s_client crash where the hostname is provided as a positional arg
X-Git-Tag: OpenSSL_1_1_1-pre1~1075
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=222417eb71a91f28381f5b3f93d7db690e8d92bf;p=oweals%2Fopenssl.git

Fix s_client crash where the hostname is provided as a positional arg

If the hostname is provided as a positional arg then s_client crashes.
The crash occurs as s_client exits (after either a successful or
unsuccessful connection attempt).

This issue was introduced by commit 729ef85611.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3881)
---

diff --git a/apps/s_client.c b/apps/s_client.c
index 5525b31769..114071c0a3 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1477,7 +1477,7 @@ int s_client_main(int argc, char **argv)
             goto opthelp;
         }
         connect_type = use_inet;
-        connectstr = *opt_rest();
+        freeandcopy(&connectstr, *opt_rest());
     } else if (argc != 0) {
         goto opthelp;
     }