Commit b3199e54 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

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



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5994)
parent f3d3b362

apps/s_socket.c

+4 −2
Original line number Diff line number Diff line
@@ -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;