Changeset 60951 in vbox

Timestamp:

May 12, 2016 2:24:29 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

107177

Message:

NetIf-darwin.cpp: don't use malloc/free, use RTMemAlloc/RTMemFree. (Or if you insist on malloc, at least include the necessary headers.)

File:

• trunk/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp (modified) (9 diffs)

trunk/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp

@@ -224 +224 @@
         return RTErrConvertFromErrno(errno);
     }
-    if ((pBuf = (char*)malloc(cbNeeded)) == NULL)
+    if ((pBuf = (char *)RTMemAlloc(cbNeeded)) == NULL)
         return VERR_NO_MEMORY;
     if (sysctl(aiMib, 6, pBuf, &cbNeeded, NULL, 0) < 0)
     {
-        free(pBuf);
+        RTMemFree(pBuf);
         Log(("getDefaultIfaceIndex: Failed to retrieve interface table (errno=%d).\n", errno));
         return RTErrConvertFromErrno(errno);
@@ -264 +264 @@
                 {
                     *pu16Index = pRtMsg->rtm_index;
-                    free(pBuf);
+                    RTMemFree(pBuf);
                     return VINF_SUCCESS;
                 }
@@ -270 +270 @@
         }
     }
-    free(pBuf);
+    RTMemFree(pBuf);
     return 0; /* Failed to find default interface, take the first one in the list. */
 }
@@ -299 +299 @@
         return RTErrConvertFromErrno(errno);
     }
-    if ((pBuf = (char*)malloc(cbNeeded)) == NULL)
+    if ((pBuf = (char*)RTMemAlloc(cbNeeded)) == NULL)
         return VERR_NO_MEMORY;
     if (sysctl(aiMib, 6, pBuf, &cbNeeded, NULL, 0) < 0)
     {
-        free(pBuf);
+        RTMemFree(pBuf);
         Log(("NetIfList: Failed to retrieve interface table (errno=%d).\n", errno));
         return RTErrConvertFromErrno(errno);
@@ -311 +311 @@
     if (sock < 0)
     {
-        free(pBuf);
+        RTMemFree(pBuf);
         Log(("NetIfList: socket() -> %d\n", errno));
         return RTErrConvertFromErrno(errno);
@@ -427 +427 @@
     }
     close(sock);
-    free(pBuf);
+    RTMemFree(pBuf);
     return rc;
 }
@@ -450 +450 @@
         return RTErrConvertFromErrno(errno);
     }
-    if ((pBuf = (char*)malloc(cbNeeded)) == NULL)
+    if ((pBuf = (char*)RTMemAlloc(cbNeeded)) == NULL)
         return VERR_NO_MEMORY;
     if (sysctl(aiMib, 6, pBuf, &cbNeeded, NULL, 0) < 0)
     {
-        free(pBuf);
+        RTMemFree(pBuf);
         Log(("NetIfList: Failed to retrieve interface table (errno=%d).\n", errno));
         return RTErrConvertFromErrno(errno);
@@ -462 +462 @@
     if (sock < 0)
     {
-        free(pBuf);
+        RTMemFree(pBuf);
         Log(("NetIfList: socket() -> %d\n", errno));
         return RTErrConvertFromErrno(errno);
@@ -527 +527 @@
     }
     close(sock);
-    free(pBuf);
+    RTMemFree(pBuf);
     return rc;
 }