Commit 2bd8c853 authored by Richard Levitte's avatar Richard Levitte
Browse files

Make BIO_sock_error return a proper error code when getsockopt fails 



BIO_sock_error() returned 1 when getsockopt() fails when it should
return the error code for that failure.

Additionally, the optlen parameter to getsockopt() has to point at
the size of the area that the optval parameter points at rather than
zero.  Some systems may forgive it being zero, but others don't.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent d78df5df

crypto/bio/b_sock.c

+2 −2
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ int BIO_get_port(const char *str, unsigned short *port_ptr) 
int BIO_sock_error(int sock)

{

    int j = 0, i;

    socklen_t size = 0;

    socklen_t size = sizeof(j);



    /*

     * Note: under Windows the third parameter is of type (char *) whereas
@@ -151,7 +151,7 @@ int BIO_sock_error(int sock) 
     */

    i = getsockopt(sock, SOL_SOCKET, SO_ERROR, (void *)&j, &size);

    if (i < 0)

        return (1);

        return (get_last_socket_error());

    else

        return (j);

}