Changeset 19388 in vbox

Timestamp:

May 5, 2009 4:28:07 PM (16 years ago)

Author:

vboxsync

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

46897

Message:

vboxdrv, Solaris/VBoxNetFlt: RTStrDup and some fixes. (flt part untested still)

Location:

trunk/src/VBox/HostDrivers

Files:

• Support/SUPDrv.c (modified) (2 diffs)
• VBoxNetFlt/solaris/VBoxNetFlt-solaris.c (modified) (5 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -52 +52 @@
 # include <iprt/crc32.h>
 # include <iprt/net.h>
+# include <iprt/string.h>
 #endif
 /* VBox/x86.h not compatible with the Linux kernel sources */
@@ -439 +440 @@
     (PFNRT)RTUuidCompareStr,
     (PFNRT)RTUuidFromStr,
+    (PFNRT)RTStrDup,
+    (PFNRT)RTStrFree,
     NULL
 };

trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c

@@ -1693 +1693 @@
      * Strip out PPA from the device name, eg: "ce3".
      */
-    char *pszDev = RTMemAllocZ(strlen(pThis->szName));
-    memcpy(pszDev, pThis->szName, strlen(pThis->szName));
+    char *pszDev = RTStrDup(pThis->szName);
     char *pszEnd = strchr(pszDev, '\0');
     int PPALen = 0;
@@ -1704 +1703 @@
     }
     pszEnd++;
-
-    char szDev[128];
-    RTStrPrintf(szDev, sizeof(szDev), "/dev/%s", pszDev);
-    RTMemFree(pszDev);
 
     int rc;
@@ -1714 +1709 @@
         && ddi_strtol(pszEnd, NULL, 10, &PPA) == 0)
     {
-        pszEnd -= PPALen;
         *pszEnd = '\0';
+        char szDev[128];
+        RTStrPrintf(szDev, sizeof(szDev), "/dev/%s", pszDev);
+
         /*
          * Try open the device as DPLI style 2.
@@ -1727 +1724 @@
             rc = dl_attach(pThis->u.s.hIface, (int)PPA, NULL);
             if (!rc)
+            {
+                RTStrFree(pszDev);
                 return VINF_SUCCESS;
+            }
 
             ldi_close(pThis->u.s.hIface, FREAD | FWRITE, kcred);
@@ -1738 +1738 @@
         LogRel((DEVICE_NAME ":vboxNetFltSolarisOpenStyle2 Failed to construct PPA.\n"));
 
+    RTStrFree(pszDev);
     return VERR_INTNET_FLT_IF_FAILED;
 }