[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  222417eb71a91f28381f5b3f93d7db690e8d92bf (commit)
      from  dd05bd4cb46e9662fae6f0f8ca9590fef6c1c957 (commit)


- Log -----------------------------------------------------------------
commit 222417eb71a91f28381f5b3f93d7db690e8d92bf
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Jul 7 15:51:02 2017 +0100

    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 at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3881)

-----------------------------------------------------------------------

Summary of changes:
 apps/s_client.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/s_client.c b/apps/s_client.c
index 5525b31..114071c 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;
     }