Changeset 25412 in vbox for trunk/src/VBox/Main/HostImpl.cpp

Timestamp:

Dec 15, 2009 3:42:05 PM (15 years ago)

Author:

vboxsync

Message:

Main/HostImpl-solaris: #4553 strdup unchecked, strtok not reentrant safe.

File:

• trunk/src/VBox/Main/HostImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/HostImpl.cpp

@@ -426 +426 @@
             {
                 char *cdromEnv = strdup(RTEnvGet("VBOX_CDROM"));
+                char *saveStr = NULL;
                 char *cdromDrive;
-                cdromDrive = strtok(cdromEnv, ":"); /** @todo use strtok_r. */
+                cdromDrive = strtok_r(cdromEnv, ":", &saveStr);
                 while (cdromDrive)
                 {
@@ -437 +438 @@
                         list.push_back(hostDVDDriveObj);
                     }
-                    cdromDrive = strtok(NULL, ":");
+                    cdromDrive = strtok_r(NULL, ":", &saveStr);
                 }
                 free(cdromEnv);
@@ -2216 +2217 @@
         while (getmntent(mntFile, &mntTab) == 0)
         {
-            char *mountName = strdup(mntTab.mnt_special);
-            char *mountPoint = strdup(mntTab.mnt_mountp);
-            char *mountFSType = strdup(mntTab.mnt_fstype);
-
-            // skip devices we are not interested in
-            if ((*mountName && mountName[0] == '/') &&                  // skip 'fake' devices (like -hosts, proc, fd, swap)
-                (*mountFSType && (strcmp(mountFSType, "devfs") != 0 &&  // skip devfs (i.e. /devices)
-                                  strcmp(mountFSType, "dev") != 0 &&    // skip dev (i.e. /dev)
-                                  strcmp(mountFSType, "lofs") != 0)) && // skip loop-back file-system (lofs)
-                (*mountPoint && strcmp(mountPoint, "/") != 0))          // skip point '/' (Can CD/DVD be mounted at '/' ???)
+            const char *mountName = mntTab.mnt_special;
+            const char *mountPoint = mntTab.mnt_mountp;
+            const char *mountFSType = mntTab.mnt_fstype;
+            if (mountName && mountPoint && mountFSType)
             {
-                char *rawDevName = getfullrawname(mountName);
-                if (validateDevice(rawDevName, true))
+                // skip devices we are not interested in
+                if ((*mountName && mountName[0] == '/') &&                      // skip 'fake' devices (like -hosts, proc, fd, swap)
+                    (*mountFSType && (strncmp(mountFSType, "devfs", 5) != 0 &&  // skip devfs (i.e. /devices)
+                                      strncmp(mountFSType, "dev", 3) != 0 &&    // skip dev (i.e. /dev)
+                                      strncmp(mountFSType, "lofs", 4) != 0)))   // skip loop-back file-system (lofs)
                 {
-                    ComObjPtr<Medium> hostDVDDriveObj;
-                    hostDVDDriveObj.createObject();
-                    hostDVDDriveObj->init(m->pParent, DeviceType_DVD, Bstr(rawDevName));
-                    list.push_back (hostDVDDriveObj);
+                    char *rawDevName = getfullrawname((char *)mountName);
+                    if (validateDevice(rawDevName, true))
+                    {
+                        ComObjPtr<Medium> hostDVDDriveObj;
+                        hostDVDDriveObj.createObject();
+                        hostDVDDriveObj->init(m->pParent, DeviceType_DVD, Bstr(rawDevName));
+                        list.push_back (hostDVDDriveObj);
+                    }
+                    free(rawDevName);
                 }
-                free(rawDevName);
             }
-
-            free(mountName);
-            free(mountPoint);
-            free(mountFSType);
         }