Changeset 3387 in vbox for trunk/src/VBox/Main/glue

Timestamp:

Jul 3, 2007 11:36:37 AM (17 years ago)

Author:

vboxsync

Message:

Main: com::GetVBoxUserHomeDirectory() now takes char * instead of Utf8Str because on XPCOM platforms, this function may be called before XPCOM has been initialized, when Utf8Str functionality is not yet available (because it uses XPCOM memory management).

Location:

trunk/src/VBox/Main/glue

Files:

• com.cpp (modified) (3 diffs)
• initterm.cpp (modified) (2 diffs)

trunk/src/VBox/Main/glue/com.cpp

@@ -133 +133 @@
 }
 
-int GetVBoxUserHomeDirectory (Utf8Str &aDir)
+int GetVBoxUserHomeDirectory (char *aDir, size_t aDirLen)
 {
+    AssertReturn (aDir, VERR_INVALID_POINTER);
+    AssertReturn (aDirLen > 0, VERR_BUFFER_OVERFLOW);
+
     /* start with null */
-    aDir.setNull();
+    *aDir = 0;
 
     const char *VBoxUserHome = RTEnvGet ("VBOX_USER_HOME");
@@ -152 +155 @@
             vrc = RTPathAbs (VBoxUserHomeUtf8, path, sizeof (path));
             if (RT_SUCCESS (vrc))
-                aDir = path;
+            {
+                if (aDirLen < strlen (path) + 1)
+                    vrc = VERR_BUFFER_OVERFLOW;
+                else
+                    strcpy (aDir, path);
+            }
             RTStrFree (VBoxUserHomeUtf8);
         }
@@ -161 +169 @@
         vrc = RTPathUserHome (path, sizeof (path));
         if (RT_SUCCESS (vrc))
-            aDir = Utf8StrFmt ("%s%c%s", path, RTPATH_DELIMITER,
-                               VBOX_USER_HOME_SUFFIX);
+        {
+            size_t len = 
+                RTStrPrintf (aDir, aDirLen, "%s%c%s",
+                             path, RTPATH_DELIMITER, VBOX_USER_HOME_SUFFIX);
+            if (len != strlen (path) + 1 + strlen (VBOX_USER_HOME_SUFFIX))
+                vrc = VERR_BUFFER_OVERFLOW;
+        }
     }
 

trunk/src/VBox/Main/glue/initterm.cpp

@@ -184 +184 @@
 
         /* prepare paths for registry files */
-        Utf8Str homeDir;
-        int vrc = GetVBoxUserHomeDirectory (homeDir);
+        char homeDir [RTPATH_MAX];
+        int vrc = GetVBoxUserHomeDirectory (homeDir, sizeof (homeDir));
         if (RT_SUCCESS (vrc))
         {
-            Utf8Str compReg = Utf8StrFmt ("%s%c%s", homeDir.raw(),
-                                          RTPATH_DELIMITER, "compreg.dat");
-            Utf8Str xptiDat = Utf8StrFmt ("%s%c%s", homeDir.raw(),
-                                          RTPATH_DELIMITER, "xpti.dat");
+            char compReg [RTPATH_MAX];
+            char xptiDat [RTPATH_MAX];
+
+            RTStrPrintf (compReg, sizeof (compReg), "%s%c%s",
+                         homeDir, RTPATH_DELIMITER, "compreg.dat");
+            RTStrPrintf (xptiDat, sizeof (xptiDat), "%s%c%s",
+                         homeDir, RTPATH_DELIMITER, "xpti.dat");
+
             dsProv = new DirectoryServiceProvider();
             if (dsProv)
@@ -230 +234 @@
             if (RT_SUCCESS (vrc))
             {
-                nsCOMPtr<nsILocalFile> file;
+                nsCOMPtr <nsILocalFile> file;
                 rc = NS_NewNativeLocalFile (nsEmbedCString (appDirCP),
                                             PR_FALSE, getter_AddRefs (file));