From d451ece4e7edce8c954daa084c83686647dcda0f Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Mon, 11 Jun 2012 08:52:11 +0000 Subject: [PATCH] b_sock.c: make getsockopt work in cases when optlen is 64-bit value. (cherry picked from commit 80c42f3e0c34451dd7cfc65e07bc639759ef07d2) --- crypto/bio/b_sock.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c index 41f958be71..a026b3e0b0 100644 --- a/crypto/bio/b_sock.c +++ b/crypto/bio/b_sock.c @@ -233,13 +233,14 @@ int BIO_get_port(const char *str, unsigned short *port_ptr) int BIO_sock_error(int sock) { int j,i; - int size; + union { size_t s; int i; } size; #if defined(OPENSSL_SYS_BEOS_R5) return 0; #endif - - size=sizeof(int); + + /* heuristic way to adapt for platforms that expect 64-bit optlen */ + size.s=0, size.i=sizeof(j); /* Note: under Windows the third parameter is of type (char *) * whereas under other systems it is (void *) if you don't have * a cast it will choke the compiler: if you do have a cast then -- 2.25.1