Commit c90da922 authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix some variable references in init_client 



We were incorrectly using "res" when we meant "ai"

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3286)
parent 0f5df0f1

apps/s_socket.c

+5 −4
Original line number Diff line number Diff line
@@ -77,13 +77,14 @@ int init_client(int *sock, const char *host, const char *port, 
        /* Admittedly, these checks are quite paranoid, we should not get

         * anything in the BIO_ADDRINFO chain that we haven't

         * asked for. */

        OPENSSL_assert((family == AF_UNSPEC || family == BIO_ADDRINFO_family(res))

                       && (type == 0 || type == BIO_ADDRINFO_socktype(res))

        OPENSSL_assert((family == AF_UNSPEC

                        || family == BIO_ADDRINFO_family(ai))

                       && (type == 0 || type == BIO_ADDRINFO_socktype(ai))

                       && (protocol == 0

                           || protocol == BIO_ADDRINFO_protocol(res)));

                           || protocol == BIO_ADDRINFO_protocol(ai)));



        *sock = BIO_socket(BIO_ADDRINFO_family(ai), BIO_ADDRINFO_socktype(ai),

                           BIO_ADDRINFO_protocol(res), 0);

                           BIO_ADDRINFO_protocol(ai), 0);

        if (*sock == INVALID_SOCKET) {

            /* Maybe the kernel doesn't support the socket family, even if

             * BIO_lookup() added it in the returned result...