From: Andy Polyakov <appro@openssl.org>
Date: Tue, 17 Apr 2018 19:30:22 +0000 (+0200)
Subject: apps/s_socket.c: fix memory sanitizer problem in ACCEPT printout.
X-Git-Tag: OpenSSL_1_1_1-pre6~86
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b3199e54d65f25c5ef6e54e129e228831a1fb363;p=oweals%2Fopenssl.git

apps/s_socket.c: fix memory sanitizer problem in ACCEPT printout.

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

diff --git a/apps/s_socket.c b/apps/s_socket.c
index d21bfc60c1..69f0f4f05e 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -211,7 +211,7 @@ int do_server(int *accept_sock, const char *host, const char *port,
     int i;
     BIO_ADDRINFO *res = NULL;
     const BIO_ADDRINFO *next;
-    int sock_family, sock_type, sock_protocol;
+    int sock_family, sock_type, sock_protocol, sock_port;
     const BIO_ADDR *sock_address;
     int sock_options = BIO_SOCK_REUSEADDR;
     int ret = 0;
@@ -280,10 +280,12 @@ int do_server(int *accept_sock, const char *host, const char *port,
     }
 #endif
 
+    sock_port = BIO_ADDR_rawport(sock_address);
+
     BIO_ADDRINFO_free(res);
     res = NULL;
 
-    if (BIO_ADDR_rawport(sock_address) == 0) {
+    if (sock_port == 0) {
         /* dynamically allocated port, report which one */
         union BIO_sock_info_u info;
         char *hostname = NULL;