Changeset 3748

Timestamp:

Mar 4, 2012, 7:51:21 PM (13 years ago)

Author:

bird

Message:

trunk: forward ported r3745, r3746 and r3747 - high memory regression in libsocket and a fix for high memory and socketpair(). References #233.

Location:

trunk/libc/src/libsocket

Files:

• getpeername.c (modified) (1 diff)
• highmemsocket.c (modified) (2 diffs)
• socketpair.c (modified) (3 diffs)

trunk/libc/src/libsocket/getpeername.c

@@ -54 +54 @@
         }
     }
-    LIBCLOG_RETURN_INT(-1);
+    LIBCLOG_RETURN_INT(rc);
 }
 

trunk/libc/src/libsocket/highmemsocket.c

@@ -116 +116 @@
         return 0;
 
-    if (__libsocket_safe_copy(&pSafeAddr->cbAddr, pcbAddr, sizeof(*pcbAddr)) != 0)
+    if (__libsocket_safe_copy(&pSafeAddr->cbAddr, pcbAddr, sizeof(*pcbAddr)) == 0)
     {
         pSafeAddr->cbAlloc = pSafeAddr->cbAddr;
@@ -122 +122 @@
         if (pSafeAddr->pvFree)
         {
-            if (__libsocket_safe_copy(pSafeAddr->pvFree, pAddr, pSafeAddr->cbAlloc) != 0)
+            if (__libsocket_safe_copy(pSafeAddr->pvFree, pAddr, pSafeAddr->cbAlloc) == 0)
             {
                 pSafeAddr->pAddr   = (struct sockaddr *)pSafeAddr->pvFree;

trunk/libc/src/libsocket/socketpair.c

@@ -126 +126 @@
     int             fh1;
     int             fh2;
+    int             aNativeFDs[2] = {-1, -1};
     PLIBCSOCKETFH   pFH1;
 
-    rc = __libsocket_socketpair(af, type, flags, osfd);
+    /* Make sure we crash here if parameter is invalid. */
+    osfd[0] = -1;
+    osfd[1] = -1;
+
+    /* Call the native API. */
+    rc = __libsocket_socketpair(af, type, flags, aNativeFDs);
     if (rc < 0)
     {
@@ -138 +144 @@
      * Allocate LIBC sockets.
      */
-    pFH1 = TCPNAMEG(AllocFH)(osfd[0], &fh1);
+    pFH1 = TCPNAMEG(AllocFH)(aNativeFDs[0], &fh1);
     if (pFH1)
     {
-        PLIBCSOCKETFH   pFH2 = TCPNAMEG(AllocFH)(osfd[1], &fh2);
+        PLIBCSOCKETFH   pFH2 = TCPNAMEG(AllocFH)(aNativeFDs[1], &fh2);
         if (pFH2)
         {
@@ -149 +155 @@
             LIBCLOG_RETURN_MSG(0, "ret 0 osfd[0]=%d osfd[1]=%d\n", osfd[0], osfd[1]);
         }
-        __libsocket_soclose(osfd[1]);
+         
+        __libsocket_soclose(aNativeFDs[1]);
         __libc_Back_ioClose(fh1);
     }
     else
     {
-        __libsocket_soclose(osfd[1]);
-        __libsocket_soclose(osfd[0]);
+        __libsocket_soclose(aNativeFDs[1]);
+        __libsocket_soclose(aNativeFDs[0]);
     }