Changeset 3487 for trunk/src

Timestamp:

May 3, 2000, 8:34:26 PM (25 years ago)

Author:

sandervl

Message:

fix for high addresses & 16 bits tcp/ip stack in setsockopt

File:

• trunk/src/wsock32/wsock32.cpp (modified) (2 diffs)

trunk/src/wsock32/wsock32.cpp

@@ -1 @@
-/* $Id: wsock32.cpp,v 1.28 2000-05-02 13:09:44 bird Exp $ */
+/* $Id: wsock32.cpp,v 1.29 2000-05-03 18:34:26 sandervl Exp $ */
 
 /*
@@ -845 +845 @@
   int               ret;
   ULONG             size;
-
-   if(!fWSAInitialized) {
-        WSASetLastError(WSANOTINITIALISED);
-        return SOCKET_ERROR;
-   }
-   else
-   if(WSAIsBlocking()) {
-        WSASetLastError(WSAEINPROGRESS);
-        return SOCKET_ERROR;
-   }
+  char             *safeoptval;
+
+   if(!fWSAInitialized) {
+        WSASetLastError(WSANOTINITIALISED);
+        return SOCKET_ERROR;
+   }
+   else
+   if(WSAIsBlocking()) {
+        WSASetLastError(WSAEINPROGRESS);
+        return SOCKET_ERROR;
+   }
+   //SvL: The 16 bits TCP/IP stack doesn't like high addresses, so copy
+   //     the option value(s) on the stack.
+   safeoptval = (char *)alloca(optlen);
+   if(safeoptval == NULL) { 
+        DebugInt3();
+        WSASetLastError(WSAEFAULT);
+        return SOCKET_ERROR;
+   }
+   memcpy(safeoptval, optval, optlen);
+   optval = safeoptval;
+
    if (level == SOL_SOCKET) {
         switch(optname) {