Changeset 6996 for trunk/src

Timestamp:

Oct 10, 2001, 10:59:23 PM (24 years ago)

Author:

phaller

Message:

Fixed FS corruption in gethostbyname

File:

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

trunk/src/wsock32/wsock32.cpp

@@ -1 @@
-/* $Id: wsock32.cpp,v 1.39 2001-10-10 17:20:17 sandervl Exp $ */
+/* $Id: wsock32.cpp,v 1.40 2001-10-10 20:59:23 phaller Exp $ */
 
 /*
@@ -1229 +1229 @@
               const char *,name)
 {
-    LPWSINFO pwsi = WINSOCK_GetIData();
-
-    if( pwsi )
+  LPWSINFO pwsi = WINSOCK_GetIData();
+
+  if( pwsi )
+  {
+    struct hostent*     host;
+    
+    USHORT sel = RestoreOS2FS();
+    host = gethostbyname( (char*) name);
+    SetFS(sel);
+    
+    if( host != NULL )
     {
-        struct hostent*     host;
-        if( (host = gethostbyname((char *)name)) != NULL ) {
-                if( WS_dup_he(pwsi, host) ) {
-                        WSASetLastError(NO_ERROR);
-                        return pwsi->he;
-                }
-                else    WSASetLastError(WSAENOBUFS);
-        }
-        else    WSASetLastError((h_errno < 0) ? wsaErrno() : wsaHerrno());
+      if( WS_dup_he(pwsi, host) )
+      {
+        WSASetLastError(NO_ERROR);
+        return pwsi->he;
+      }
+      else
+        WSASetLastError(WSAENOBUFS);
     }
-    else WSASetLastError(WSANOTINITIALISED);
-    return NULL;
+    else
+      WSASetLastError((h_errno < 0) ? wsaErrno() : wsaHerrno());
+  }
+  else
+    WSASetLastError(WSANOTINITIALISED);
+
+  return NULL;
 }
 //******************************************************************************