Changeset 18465 in vbox for trunk/src/VBox

Timestamp:

Mar 28, 2009 6:53:26 PM (16 years ago)

Author:

vboxsync

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

45294

Message:

SUPDrv.c: Avoid the strcpy warning on darwin by using strlen+memcpy, this also allows us to use memcmp instead of strcmp in the search loop.

File:

• trunk/src/VBox/HostDrivers/Support/SUPDrv.c (modified) (5 diffs)

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

@@ -1602 +1602 @@
             {
                 OSDBGPRINT(("SUPDRV_IDC_REQ_CONNECT: u32MagicCookie=%#x expected %#x!\n",
-                            pReq->u.In.u32MagicCookie, SUPDRVIDCREQ_CONNECT_MAGIC_COOKIE));
+                            (unsigned)pReq->u.In.u32MagicCookie, (unsigned)SUPDRVIDCREQ_CONNECT_MAGIC_COOKIE));
                 return pReqHdr->rc = VERR_INVALID_PARAMETER;
             }
@@ -1621 +1621 @@
             {
                 OSDBGPRINT(("SUPDRV_IDC_REQ_CONNECT: Version mismatch. Requested: %#x  Min: %#x  Current: %#x\n",
-                            pReq->u.In.uReqVersion, pReq->u.In.uMinVersion, SUPDRV_IDC_VERSION));
+                            pReq->u.In.uReqVersion, pReq->u.In.uMinVersion, (unsigned)SUPDRV_IDC_VERSION));
                 pReq->u.Out.pSession        = NULL;
                 pReq->u.Out.uSessionVersion = 0xffffffff;
@@ -3306 +3306 @@
     unsigned        cb;
     void           *pv;
+    size_t          cchName = strlen(pReq->u.In.szName); /* (caller checked < 32). */
     LogFlow(("supdrvIOCtl_LdrOpen: szName=%s cbImage=%d\n", pReq->u.In.szName, pReq->u.In.cbImage));
 
@@ -3314 +3315 @@
     for (pImage = pDevExt->pLdrImages; pImage; pImage = pImage->pNext)
     {
-        if (!strcmp(pImage->szName, pReq->u.In.szName))
+        if (    pImage->szName[cchName] == '\0'
+            &&  !memcmp(pImage->szName, pReq->u.In.szName, cchName))
         {
             pImage->cUsage++;
@@ -3349 +3351 @@
     pImage->uState          = SUP_IOCTL_LDR_OPEN;
     pImage->cUsage          = 1;
-    strcpy(pImage->szName, pReq->u.In.szName);
+    memcpy(pImage->szName, pReq->u.In.szName, cchName + 1);
 
     pImage->pNext           = pDevExt->pLdrImages;