wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make BIO_sock_error return a proper error code when getsockopt fails

Browse source 
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: Matt Caswell <matt@openssl.org>
This commit is contained in:
Richard Levitte 2016-04-28 13:19:38 +02:00
parent d78df5dfd6
commit 2bd8c85395
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crypto/bio/b_sock.c
View file

@ -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);
}