Changeset 33464 in vbox for trunk

Timestamp:

Oct 26, 2010 12:27:50 PM (14 years ago)

Author:

vboxsync

Message:

*: Fixes for incorrect RTStrAPrintf usage (it does NOT return an IPRT status code) and the odd bugs nearby.

Location:

trunk

Files:

• include/iprt/fs.h (modified) (1 diff)
• include/iprt/isofs.h (modified) (2 diffs)
• src/VBox/Additions/WINNT/VBoxTray/VBoxSharedFolders.cpp (modified) (5 diffs)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSharedFolders.cpp (modified) (1 diff)
• src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp (modified) (2 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServiceCpuHotPlug.cpp (modified) (4 diffs)
• src/VBox/Devices/Network/lwip/vbox/sys_arch.c (modified) (2 diffs)
• src/VBox/Devices/Storage/DrvHostBase.cpp (modified) (2 diffs)
• src/VBox/Devices/Storage/VBoxHDD.cpp (modified) (4 diffs)
• src/VBox/Devices/Storage/VmdkHDDCore.cpp (modified) (10 diffs)
• src/VBox/Frontends/VBoxHeadless/FramebufferVNC.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (2 diffs)
• src/VBox/HostDrivers/VBoxUSB/solaris/USBLib-solaris.cpp (modified) (1 diff)
• src/VBox/Main/ApplianceImpl.cpp (modified) (2 diffs)
• src/VBox/Main/ApplianceImplExport.cpp (modified) (1 diff)
• src/VBox/Main/ApplianceImplImport.cpp (modified) (2 diffs)
• src/VBox/Main/ConsoleImpl.cpp (modified) (2 diffs)
• src/VBox/Main/GuestImpl.cpp (modified) (2 diffs)
• src/VBox/Main/linux/USBProxyServiceLinux.cpp (modified) (1 diff)
• src/VBox/Runtime/common/misc/tar.cpp (modified) (2 diffs)
• src/VBox/Runtime/common/string/straprintf.cpp (modified) (1 diff)
• src/VBox/Runtime/r3/posix/env-posix.cpp (modified) (1 diff)
• src/VBox/Runtime/r3/xml.cpp (modified) (2 diffs)
• src/VBox/Runtime/testcase/tstDir-3.cpp (modified) (1 diff)

trunk/include/iprt/fs.h

@@ -563 +563 @@
 RT_C_DECLS_END
 
-#endif /* ___iprt_fs_h */
-
+#endif /* !___iprt_fs_h */
+

trunk/include/iprt/isofs.h

@@ -27 +27 @@
 #define ___iprt_isofs_h
 
-#include <iprt/file.h>
-#include <iprt/mem.h>
+#include <iprt/types.h>
 #include <iprt/list.h>
-#include <iprt/string.h>
 
 RT_C_DECLS_BEGIN
@@ -221 +219 @@
 RT_C_DECLS_END
 
-#endif /* ___iprt_isofs_h */
-
+#endif
+

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxSharedFolders.cpp

@@ -57 +57 @@
                         Log(("VBoxTray: Connecting share %u (%s) ...\n", i+1, pszName));
 
-                        char *pszShareName = NULL;
-                        if (   RTStrAPrintf(&pszShareName, "\\\\vboxsrv\\%s", pszName) > 0
-                            && pszShareName)
+                        char *pszShareName;
+                        if (RTStrAPrintf(&pszShareName, "\\\\vboxsrv\\%s", pszName) >= 0)
                         {
-                            char cDrive = 'D'; /* Start probing whether drive D: is free to use. */
+                            char chDrive = 'D'; /* Start probing whether drive D: is free to use. */
                             do
                             {
                                 char szCurDrive[3];
-                                RTStrPrintf(szCurDrive, sizeof(szCurDrive), "%c:", cDrive++);
+                                RTStrPrintf(szCurDrive, sizeof(szCurDrive), "%c:", chDrive++);
 
                                 NETRESOURCE resource;
@@ -102 +101 @@
                                     }
                                 }
-                            } while(cDrive <= 'Z');
-
-                            if (cDrive > 'Z')
+                            } while (chDrive <= 'Z');
+
+                            if (chDrive > 'Z')
                             {
                                 LogRel(("VBoxTray: No free driver letter found to assign shared folder \"%s\", aborting.\n", pszName));
@@ -113 +112 @@
                         }
                         else
-                            rc = VERR_NO_MEMORY;
+                            rc = VERR_NO_STR_MEMORY;
                         RTStrFree(pszName);
                     }
@@ -156 +155 @@
                     Log(("VBoxTray: Disconnecting share %u (%s) ...\n", i+1, pszName));
 
-                    char *pszShareName = NULL;
-                    if (   RTStrAPrintf(&pszShareName, "\\\\vboxsrv\\%s", pszName) > 0
-                        && pszShareName)
+                    char *pszShareName;
+                    if (RTStrAPrintf(&pszShareName, "\\\\vboxsrv\\%s", pszName) >= 0)
                     {
                         DWORD dwErr = WNetCancelConnection2(pszShareName, 0, FALSE /* Force disconnect */);
@@ -164 +162 @@
                         {
                             LogRel(("VBoxTray: Share \"%s\" was disconnected\n", pszShareName));
+                            RTStrFree(pszShareName);
+                            RTStrFree(pszName);
                             break;
                         }
-                        else
+
+                        LogRel(("VBoxTray: Disconnecting \"%s\" failed, dwErr = %ld\n", pszShareName, dwErr));
+
+                        switch (dwErr)
                         {
-                            LogRel(("VBoxTray: Disconnecting \"%s\" failed, dwErr = %ld\n", pszShareName, dwErr));
-
-                            switch (dwErr)
-                            {
-                                case ERROR_NOT_CONNECTED:
-                                    break;
-
-                                default:
-                                    LogRel(("VBoxTray: Error while disconnecting shared folder \"%s\", error = %ld\n",
-                                            pszShareName, dwErr));
-                                    break;
-                            }
+                            case ERROR_NOT_CONNECTED:
+                                break;
+
+                            default:
+                                LogRel(("VBoxTray: Error while disconnecting shared folder \"%s\", error = %ld\n",
+                                        pszShareName, dwErr));
+                                break;
                         }
 

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSharedFolders.cpp

@@ -280 +280 @@
         {
 #endif
-            if (RTStrAPrintf(ppszPrefix, "sf_"))
-                rc = VINF_SUCCESS;
-            else
-                rc = VERR_NO_MEMORY;
+            rc = RTStrDupEx(ppszPrefix, "sf_");
 #ifdef VBOX_WITH_GUEST_PROPS
         }

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp

@@ -940 +940 @@
         if (uNumEnvVars)
         {
-            pData->papszEnv = (char**)RTMemAlloc(uNumEnvVars * sizeof(char*));
+            pData->papszEnv = (char **)RTMemAlloc(uNumEnvVars * sizeof(char*));
             AssertPtr(pData->papszEnv);
             pData->uNumEnvVars = uNumEnvVars;
 
-            const char *pcCur = pszEnv;
+            const char *pszCur = pszEnv;
             uint32_t i = 0;
             uint32_t cbLen = 0;
@@ -955 +955 @@
                     break;
                 }
-                int cbStr = RTStrAPrintf(&pData->papszEnv[i++], "%s", pcCur);
+                int cbStr = RTStrAPrintf(&pData->papszEnv[i++], "%s", pszCur);
                 if (cbStr < 0)
                 {
-                    rc = VERR_NO_MEMORY;
+                    rc = VERR_NO_STR_MEMORY;
                     break;
                 }
-                cbLen += cbStr + 1; /* Skip terminating '\0' */
-                pcCur += cbStr + 1; /* Skip terminating '\0' */
+                pszCur += cbStr + 1; /* Skip terminating '\0' */
+                cbLen  += cbStr + 1; /* Skip terminating '\0' */
             }
         }

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceCpuHotPlug.cpp

@@ -154 +154 @@
             {
                 PCSYSFSCPUPATHCOMP pPathComponent = &pAcpiCpuPathLvl->aComponentsPossible[iCompCurr];
+
+                /* Open the directory */
                 PRTDIR pDirCurr = NULL;
-                char *pszPathTmp = NULL;
-                bool fFound = false;
-
-                rc = RTStrAPrintf(&pszPathTmp, "%s/%s*", pszPath, pPathComponent->pcszName);
+                char *pszPathTmp = RTPathJoinA(pszPath, pPathComponent->pcszName);
+                if (pszPathTmp)
+                {
+                    rc = RTDirOpenFiltered(&pDirCurr, pszPathTmp, RTDIRFILTER_WINNT);
+                    RTStrFree(pszPathTmp);
+                }
+                else
+                    rc = VERR_NO_STR_MEMORY;
                 if (RT_FAILURE(rc))
                     break;
 
-                /* Open the directory */
-                rc = RTDirOpenFiltered(&pDirCurr, pszPathTmp, RTDIRFILTER_WINNT);
-                if (RT_FAILURE(rc))
-                {
-                    RTStrFree(pszPathTmp);
-                    break;
-                }
-
                 /* Search if the current directory contains one of the possible parts. */
+                size_t cchName = strlen(pPathComponent->pcszName);
                 RTDIRENTRY DirFolderContent;
+                bool fFound = false;
                 while (RT_SUCCESS(RTDirRead(pDirCurr, &DirFolderContent, NULL))) /* Assumption that szName has always enough space */
                 {
-                    if (!strncmp(DirFolderContent.szName, pPathComponent->pcszName, strlen(pPathComponent->pcszName)))
+                    if (   DirFolderContent.cbName >= cchName
+                        && !strncmp(DirFolderContent.szName, pPathComponent->pcszName, cchName))
                     {
-                        char *pszPathLvl = NULL;
-
                         /* Found, use the complete name to dig deeper. */
                         fFound = true;
                         pAcpiCpuPathLvl->uId = iCompCurr;
-                        rc = RTStrAPrintf(&pszPathLvl, "%s/%s", pszPath, DirFolderContent.szName);
-
-                        if (RT_SUCCESS(rc))
+                        char *pszPathLvl = RTPathJoinA(pszPath, DirFolderContent.szName);
+                        if (pszPathLvl)
                         {
                             RTStrFree(pszPath);
                             pszPath = pszPathLvl;
                         }
+                        else
+                            rc = VERR_NO_STR_MEMORY;
                         break;
                     }
@@ -235 +235 @@
         /* Init everything. */
         Assert(pAcpiCpuPathLvl->uId != ACPI_CPU_PATH_NOT_PROBED);
-        rc = RTStrAPrintf(&pszPath,
-                          "%s/%s*", SYSFS_ACPI_CPU_PATH,
-                          pAcpiCpuPathLvl->aComponentsPossible[pAcpiCpuPathLvl->uId].pcszName);
-        if (RT_FAILURE(rc))
-            return rc;
+        pszPath = RTPathJoinA(SYSFS_ACPI_CPU_PATH, pAcpiCpuPathLvl->aComponentsPossible[pAcpiCpuPathLvl->uId].pcszName);
+        if (!pszPath)
+            return VERR_NO_STR_MEMORY;
 
         pAcpiCpuPathLvl->pszPath = RTStrDup(SYSFS_ACPI_CPU_PATH);
         if (!pAcpiCpuPathLvl->pszPath)
-            return VERR_NO_MEMORY;
+        {
+            RTStrFree(pszPath);
+            return VERR_NO_STR_MEMORY;
+        }
 
         /* Open the directory */
@@ -259 +260 @@
                 if (RT_SUCCESS(rc))
                 {
-                    char *pszPathCurr;
-
                     /* Create the new path. */
-                    rc = RTStrAPrintf(&pszPathCurr, "%s/%s", pAcpiCpuPathLvl->pszPath, DirFolderContent.szName);
-                    if (RT_FAILURE(rc))
+                    char *pszPathCurr = RTPathJoinA(pAcpiCpuPathLvl->pszPath, DirFolderContent.szName);
+                    if (!pszPathCurr)
+                    {
+                        rc = VERR_NO_STR_MEMORY;
                         break;
+                    }
 
                     /* If this is the last level check for the given core and package id. */
@@ -306 +308 @@
                         Assert(pAcpiCpuPathLvl->uId != ACPI_CPU_PATH_NOT_PROBED);
 
-                        rc = RTStrAPrintf(&pszPathDir, "%s/%s*", pszPathCurr, pPathComponent->pcszName);
-                        if (RT_FAILURE(rc))
+                        pszPathDir = RTPathJoinA(pszPathCurr, pPathComponent->pcszName);
+                        if (!pszPathDir)
+                        {
+                            rc = VERR_NO_STR_MEMORY;
                             break;
+                        }
 
                         VBoxServiceVerbose(3, "New path %s\n", pszPathDir);

trunk/src/VBox/Devices/Network/lwip/vbox/sys_arch.c

@@ -383 +383 @@
 {
     int rc;
-    char *pszThread = NULL;
 #if SYS_LIGHTWEIGHT_PROT
     SYS_ARCH_DECL_PROTECT(old_level);
@@ -400 +399 @@
     g_aTLS[id].thread = thread;
     g_aTLS[id].arg = arg;
-    RTStrAPrintf(&pszThread, "lwIP%u", id);
-    rc = RTThreadCreate(&tid, sys_thread_adapter, &g_aTLS[id], 0,
-                        RTTHREADTYPE_IO, 0, pszThread);
+    rc = RTThreadCreateF(&tid, sys_thread_adapter, &g_aTLS[id], 0,
+                         RTTHREADTYPE_IO, 0, "lwIP%u", id);
     if (RT_FAILURE(rc))
     {

trunk/src/VBox/Devices/Storage/DrvHostBase.cpp

@@ -970 +970 @@
         rc = RTStrAPrintf(&pszPassthroughDevice, "/dev/%s%u",
                           DeviceCCB.cgdl.periph_name, DeviceCCB.cgdl.unit_number);
-        if (RT_SUCCESS(rc))
+        if (rc >= 0)
         {
             RTFILE PassthroughDevice;
@@ -1013 +1013 @@
             }
         }
+        else
+            rc = VERR_NO_STR_MEMORY;
     }
     else

trunk/src/VBox/Devices/Storage/VBoxHDD.cpp

@@ -2075 +2075 @@
 
     /* To get all entries with VBoxHDD as prefix. */
-    char *pszPluginFilter;
-    rc = RTStrAPrintf(&pszPluginFilter, "%s/%s*", szPath, VBOX_HDDFORMAT_PLUGIN_PREFIX);
-    if (RT_FAILURE(rc))
-    {
-        rc = VERR_NO_MEMORY;
-        return rc;
-    }
+    char *pszPluginFilter = RTPathJoinA(szPath, VBOX_HDDFORMAT_PLUGIN_PREFIX "*");
+    if (!pszPluginFilter)
+        return VERR_NO_STR_MEMORY;
 
     PRTDIRENTRYEX pPluginDirEntry = NULL;
@@ -2127 +2123 @@
 
         /* Prepend the path to the libraries. */
-        rc = RTStrAPrintf(&pszPluginPath, "%s/%s", szPath, pPluginDirEntry->szName);
-        if (RT_FAILURE(rc))
-        {
-            rc = VERR_NO_MEMORY;
+        pszPluginPath = RTPathJoinA(szPath, pPluginDirEntry->szName);
+        if (!pszPluginPath)
+        {
+            rc = VERR_NO_STR_MEMORY;
             break;
         }
@@ -2195 +2191 @@
 
     /* To get all entries with VBoxHDD as prefix. */
-    char *pszPluginFilter;
-    rc = RTStrAPrintf(&pszPluginFilter, "%s/%s*", szPath, VD_CACHEFORMAT_PLUGIN_PREFIX);
-    if (RT_FAILURE(rc))
-    {
-        rc = VERR_NO_MEMORY;
+    char *pszPluginFilter = RTPathJoinA(szPath, VD_CACHEFORMAT_PLUGIN_PREFIX "*");
+    if (!pszPluginFilter)
+    {
+        rc = VERR_NO_STR_MEMORY;
         return rc;
     }
@@ -2247 +2242 @@
 
         /* Prepend the path to the libraries. */
-        rc = RTStrAPrintf(&pszPluginPath, "%s/%s", szPath, pPluginDirEntry->szName);
-        if (RT_FAILURE(rc))
-        {
-            rc = VERR_NO_MEMORY;
+        pszPluginPath = RTPathJoinA(szPath, pPluginDirEntry->szName);
+        if (!pszPluginPath)
+        {
+            rc = VERR_NO_STR_MEMORY;
             break;
         }

trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp

@@ -1700 +1700 @@
     char *pszValueQuoted;
 
-    int rc = RTStrAPrintf(&pszValueQuoted, "\"%s\"", pszValue);
-    if (RT_FAILURE(rc))
-        return rc;
-    rc = vmdkDescSetStr(pImage, pDescriptor, pDescriptor->uFirstDesc, pszKey,
-                        pszValueQuoted);
+    RTStrAPrintf(&pszValueQuoted, "\"%s\"", pszValue);
+    if (!pszValueQuoted)
+        return VERR_NO_STR_MEMORY;
+    int rc = vmdkDescSetStr(pImage, pDescriptor, pDescriptor->uFirstDesc, pszKey,
+                            pszValueQuoted);
     RTStrFree(pszValueQuoted);
     return rc;
@@ -1870 +1870 @@
     if (pszVal)
     {
-        rc = RTStrAPrintf(&pszValQuoted, "\"%s\"", pszVal);
-        if (RT_FAILURE(rc))
-            return rc;
+        RTStrAPrintf(&pszValQuoted, "\"%s\"", pszVal);
+        if (!pszValQuoted)
+            return VERR_NO_STR_MEMORY;
     }
     else
@@ -1888 +1888 @@
     char *pszUuid;
 
-    int rc = RTStrAPrintf(&pszUuid, "\"%RTuuid\"", pUuid);
-    if (RT_FAILURE(rc))
-        return rc;
-    rc = vmdkDescSetStr(pImage, pDescriptor, pDescriptor->uFirstDDB, pszKey,
-                        pszUuid);
+    RTStrAPrintf(&pszUuid, "\"%RTuuid\"", pUuid);
+    if (!pszUuid)
+        return VERR_NO_STR_MEMORY;
+    int rc = vmdkDescSetStr(pImage, pDescriptor, pDescriptor->uFirstDDB, pszKey,
+                            pszUuid);
     RTStrFree(pszUuid);
     return rc;
@@ -1902 +1902 @@
     char *pszValue;
 
-    int rc = RTStrAPrintf(&pszValue, "\"%d\"", uValue);
-    if (RT_FAILURE(rc))
-        return rc;
-    rc = vmdkDescSetStr(pImage, pDescriptor, pDescriptor->uFirstDDB, pszKey,
-                        pszValue);
+    RTStrAPrintf(&pszValue, "\"%d\"", uValue);
+    if (!pszValue)
+        return VERR_NO_STR_MEMORY;
+    int rc = vmdkDescSetStr(pImage, pDescriptor, pDescriptor->uFirstDDB, pszKey,
+                            pszValue);
     RTStrFree(pszValue);
     return rc;
@@ -3447 +3447 @@
                 else
                 {
-                    size_t cbDirname;
                     char *pszDirname = RTStrDup(pImage->pszFilename);
                     if (!pszDirname)
@@ -3455 +3454 @@
                     }
                     RTPathStripFilename(pszDirname);
-                    cbDirname = strlen(pszDirname);
-                    rc = RTStrAPrintf(&pszFullname, "%s%c%s", pszDirname,
-                                      RTPATH_SLASH, pExtent->pszBasename);
+                    pszFullname = RTPathJoinA(pszDirname, pExtent->pszBasename);
                     RTStrFree(pszDirname);
-                    if (RT_FAILURE(rc))
+                    if (!pszFullname)
+                    {
+                        rc = VERR_NO_STR_MEMORY;
                         goto out;
+                    }
                 }
                 pExtent->pszFullname = pszFullname;
@@ -3720 +3720 @@
 
                 /* Set up full name for partition extent. */
-                size_t cbDirname;
                 char *pszDirname = RTStrDup(pImage->pszFilename);
                 if (!pszDirname)
-                    return VERR_NO_MEMORY;
+                    return VERR_NO_STR_MEMORY;
                 RTPathStripFilename(pszDirname);
-                cbDirname = strlen(pszDirname);
-                char *pszFullname;
-                rc = RTStrAPrintf(&pszFullname, "%s%c%s", pszDirname,
-                                  RTPATH_SLASH, pExtent->pszBasename);
+                char *pszFullname = RTPathJoinA(pszDirname, pExtent->pszBasename);
                 RTStrFree(pszDirname);
-                if (RT_FAILURE(rc))
-                    return rc;
+                if (!pszDirname)
+                    return VERR_NO_STR_MEMORY;
                 pExtent->pszFullname = pszFullname;
                 pExtent->enmType = VMDKETYPE_FLAT;
@@ -3888 +3884 @@
             {
                 if (cExtents == 1)
-                    rc = RTStrAPrintf(&pszTmp, "%s-flat%s", pszBasenameBase,
-                                      pszBasenameExt);
+                    RTStrAPrintf(&pszTmp, "%s-flat%s", pszBasenameBase,
+                                 pszBasenameExt);
                 else
-                    rc = RTStrAPrintf(&pszTmp, "%s-f%03d%s", pszBasenameBase,
-                                      i+1, pszBasenameExt);
+                    RTStrAPrintf(&pszTmp, "%s-f%03d%s", pszBasenameBase,
+                                 i+1, pszBasenameExt);
             }
             else
-                rc = RTStrAPrintf(&pszTmp, "%s-s%03d%s", pszBasenameBase, i+1,
-                                  pszBasenameExt);
+                RTStrAPrintf(&pszTmp, "%s-s%03d%s", pszBasenameBase, i+1,
+                             pszBasenameExt);
             RTStrFree(pszBasenameBase);
-            if (RT_FAILURE(rc))
-                return rc;
+            if (!pszTmp)
+                return VERR_NO_STR_MEMORY;
             cbTmp = strlen(pszTmp) + 1;
             char *pszBasename = (char *)RTMemTmpAlloc(cbTmp);
@@ -3911 +3907 @@
         }
         char *pszBasedirectory = RTStrDup(pImage->pszFilename);
+        if (!pszBasedirectory)
+            return VERR_NO_STR_MEMORY;
         RTPathStripFilename(pszBasedirectory);
-        char *pszFullname;
-        rc = RTStrAPrintf(&pszFullname, "%s%c%s", pszBasedirectory,
-                          RTPATH_SLASH, pExtent->pszBasename);
+        char *pszFullname = RTPathJoinA(pszBasedirectory, pExtent->pszBasename);
         RTStrFree(pszBasedirectory);
-        if (RT_FAILURE(rc))
-            return rc;
+        if (!pszFullname)
+            return VERR_NO_STR_MEMORY;
         pExtent->pszFullname = pszFullname;
 
@@ -4110 +4106 @@
     char *pszBasedirectory = RTStrDup(pImage->pszFilename);
     RTPathStripFilename(pszBasedirectory);
-    char *pszFullname;
-    rc = RTStrAPrintf(&pszFullname, "%s%c%s", pszBasedirectory,
-                      RTPATH_SLASH, pExtent->pszBasename);
+    char *pszFullname = RTPathJoinA(pszBasedirectory, pExtent->pszBasename);
     RTStrFree(pszBasedirectory);
-    if (RT_FAILURE(rc))
-        return rc;
+    if (!pszFullname)
+        return VERR_NO_STR_MEMORY;
     pExtent->pszFullname = pszFullname;
 

trunk/src/VBox/Frontends/VBoxHeadless/FramebufferVNC.cpp

@@ -93 +93 @@
     char *pszDesktopName;
     rc = RTStrAPrintf(&pszDesktopName, "%s - VirtualBox", pszName);
-    if (RT_SUCCESS(rc))
-        vncServer->desktopName = (const char*)pszDesktopName;
+    if (rc >= 0)
+        vncServer->desktopName = pszDesktopName;
     else
         vncServer->desktopName = "VirtualBox";

trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp

@@ -1323 +1323 @@
                     /* Refer to the correct partition and use offset 0. */
                     char *psz;
-                    vrc = RTStrAPrintf(&psz, "%s%u", rawdisk.c_str(),
-                                       partitions.aPartitions[i].uIndex);
-                    if (RT_FAILURE(vrc))
+                    RTStrAPrintf(&psz, "%s%u", rawdisk.c_str(),
+                                 partitions.aPartitions[i].uIndex);
+                    if (!psz)
                     {
+                        vrc = VERR_NO_STR_MEMORY;
                         RTMsgError("Cannot create reference to individual partition %u, rc=%Rrc",
-                                 partitions.aPartitions[i].uIndex, vrc);
+                                   partitions.aPartitions[i].uIndex, vrc);
                         goto out;
                     }
@@ -1336 +1337 @@
                     /* Refer to the correct partition and use offset 0. */
                     char *psz;
-                    vrc = RTStrAPrintf(&psz, "%ss%u", rawdisk.c_str(),
-                                       partitions.aPartitions[i].uIndex);
-                    if (RT_FAILURE(vrc))
+                    RTStrAPrintf(&psz, "%ss%u", rawdisk.c_str(),
+                                 partitions.aPartitions[i].uIndex);
+                    if (!psz)
                     {
+                        vrc = VERR_NO_STR_MEMORY;
                         RTMsgError("Cannot create reference to individual partition %u, rc=%Rrc",
                                  partitions.aPartitions[i].uIndex, vrc);

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

@@ -37 +37 @@
 #include <iprt/asm.h>
 #include <iprt/dir.h>
+#include <iprt/file.h>
 #include <iprt/isofs.h>
 #include <iprt/getopt.h>
@@ -746 +747 @@
                     if (RTStrAPrintf(&pszFileSource, "%s%s%s",
                                      pszRootDir, pszSubDir ? pszSubDir : "",
-                                     DirEntry.szName))
+                                     DirEntry.szName) >= 0)
                     {
                         if (!RTStrAPrintf(&pszFileDest, "%s%s",
                                           pszSubDir ? pszSubDir : "",
-                                          DirEntry.szName))
+                                          DirEntry.szName) >= 0)
                         {
                             rc = VERR_NO_MEMORY;

trunk/src/VBox/HostDrivers/VBoxUSB/solaris/USBLib-solaris.cpp

@@ -207 +207 @@
     {
         *pInstance = Req.Instance;
-        rc = RTStrAPrintf(ppszClientPath, "%s", Req.achClientPath);
+        rc = RTStrDupEx(ppszClientPath, Req.achClientPath);
         if (RT_SUCCESS(rc))
             return VINF_SUCCESS;

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -589 +589 @@
     char *tmpName = RTStrDup(aName.c_str());
     int i = 1;
-    /* @todo: Maybe too cost-intensive; try to find a lighter way */
+    /** @todo: Maybe too cost-intensive; try to find a lighter way */
     while (mVirtualBox->FindMachine(Bstr(tmpName).raw(), &machine) != VBOX_E_OBJECT_NOT_FOUND)
     {
@@ -609 +609 @@
     /* Check if the file exists or if a file with this path is registered
      * already */
-    /* @todo: Maybe too cost-intensive; try to find a lighter way */
+    /** @todo: Maybe too cost-intensive; try to find a lighter way */
     while (    RTPathExists(tmpName)
             || mVirtualBox->FindMedium(Bstr(tmpName).raw(), DeviceType_HardDisk, &harddisk) != VBOX_E_OBJECT_NOT_FOUND

trunk/src/VBox/Main/ApplianceImplExport.cpp

@@ -1924 +1924 @@
     RTPathTemp(szOSTmpDir, sizeof(szOSTmpDir));
     /* The template for the temporary directory created below */
-    char *pszTmpDir;
-    RTStrAPrintf(&pszTmpDir, "%s"RTPATH_SLASH_STR"vbox-ovf-XXXXXX", szOSTmpDir);
+    char *pszTmpDir = RTPathJoinA(szOSTmpDir, "vbox-ovf-XXXXXX");
     list< pair<Utf8Str, ULONG> > filesList;
 

trunk/src/VBox/Main/ApplianceImplImport.cpp

@@ -874 +874 @@
     RTPathTemp(szOSTmpDir, sizeof(szOSTmpDir));
     /* The template for the temporary directory created below */
-    char *pszTmpDir;
-    RTStrAPrintf(&pszTmpDir, "%s"RTPATH_SLASH_STR"vbox-ovf-XXXXXX", szOSTmpDir);
+    char *pszTmpDir = RTPathJoinA(szOSTmpDir, "vbox-ovf-XXXXXX");
     list< pair<Utf8Str, ULONG> > filesList;
     Utf8Str strTmpOvf;
@@ -1304 +1303 @@
     RTPathTemp(szOSTmpDir, sizeof(szOSTmpDir));
     /* The template for the temporary directory created below */
-    char *pszTmpDir;
-    RTStrAPrintf(&pszTmpDir, "%s"RTPATH_SLASH_STR"vbox-ovf-XXXXXX", szOSTmpDir);
+    char *pszTmpDir = RTPathJoinA(szOSTmpDir, "vbox-ovf-XXXXXX");
     list< pair<Utf8Str, ULONG> > filesList;
 

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -636 +636 @@
     }
 
-    int rc;
-    char *pszPropertyName;
+    char szPropNm[256];
     Bstr bstrReadOnlyGuest(L"RDONLYGUEST");
 
-    rc = RTStrAPrintf(&pszPropertyName, "/VirtualBox/HostInfo/VRDP/Client/%u/Name", u32ClientId);
-    if (RT_SUCCESS(rc))
-    {
-        Bstr clientName;
-        mVRDEServerInfo->COMGETTER(ClientName)(clientName.asOutParam());
-
-        mMachine->SetGuestProperty(Bstr(pszPropertyName).raw(),
-                                   clientName.raw(),
-                                   bstrReadOnlyGuest.raw());
-        RTStrFree(pszPropertyName);
-    }
-
-    rc = RTStrAPrintf(&pszPropertyName, "/VirtualBox/HostInfo/VRDP/Client/%u/User", u32ClientId);
-    if (RT_SUCCESS(rc))
-    {
-        mMachine->SetGuestProperty(Bstr(pszPropertyName).raw(),
-                                   Bstr(pszUser).raw(),
-                                   bstrReadOnlyGuest.raw());
-        RTStrFree(pszPropertyName);
-    }
-
-    rc = RTStrAPrintf(&pszPropertyName, "/VirtualBox/HostInfo/VRDP/Client/%u/Domain", u32ClientId);
-    if (RT_SUCCESS(rc))
-    {
-        mMachine->SetGuestProperty(Bstr(pszPropertyName).raw(),
-                                   Bstr(pszDomain).raw(),
-                                   bstrReadOnlyGuest.raw());
-        RTStrFree(pszPropertyName);
-    }
-
-    char *pszClientId;
-    rc = RTStrAPrintf(&pszClientId, "%d", u32ClientId);
-    if (RT_SUCCESS(rc))
-    {
-        mMachine->SetGuestProperty(Bstr("/VirtualBox/HostInfo/VRDP/LastConnectedClient").raw(),
-                                   Bstr(pszClientId).raw(),
-                                   bstrReadOnlyGuest.raw());
-        RTStrFree(pszClientId);
-    }
+    RTStrPrintf(szPropNm, sizeof(szPropNm), "/VirtualBox/HostInfo/VRDP/Client/%u/Name", u32ClientId);
+    Bstr clientName;
+    mVRDEServerInfo->COMGETTER(ClientName)(clientName.asOutParam());
+
+    mMachine->SetGuestProperty(Bstr(szPropNm).raw(),
+                               clientName.raw(),
+                               bstrReadOnlyGuest.raw());
+
+    RTStrPrintf(szPropNm, sizeof(szPropNm), "/VirtualBox/HostInfo/VRDP/Client/%u/User", u32ClientId);
+    mMachine->SetGuestProperty(Bstr(szPropNm).raw(),
+                               Bstr(pszUser).raw(),
+                               bstrReadOnlyGuest.raw());
+
+    RTStrPrintf(szPropNm, sizeof(szPropNm), "/VirtualBox/HostInfo/VRDP/Client/%u/Domain", u32ClientId);
+    mMachine->SetGuestProperty(Bstr(szPropNm).raw(),
+                               Bstr(pszDomain).raw(),
+                               bstrReadOnlyGuest.raw());
+
+    char szClientId[64];
+    RTStrPrintf(szClientId, sizeof(szClientId), "%d", u32ClientId);
+    mMachine->SetGuestProperty(Bstr("/VirtualBox/HostInfo/VRDP/LastConnectedClient").raw(),
+                               Bstr(szClientId).raw(),
+                               bstrReadOnlyGuest.raw());
 
     return;
@@ -690 +673 @@
     Bstr bstrReadOnlyGuest(L"RDONLYGUEST");
 
-    int rc;
-    char *pszPropertyName;
-
-    rc = RTStrAPrintf(&pszPropertyName, "/VirtualBox/HostInfo/VRDP/Client/%u/Name", u32ClientId);
-    if (RT_SUCCESS(rc))
-    {
-        mMachine->SetGuestProperty(Bstr(pszPropertyName).raw(), Bstr("").raw(),
-                                   bstrReadOnlyGuest.raw());
-        RTStrFree(pszPropertyName);
-    }
-
-    rc = RTStrAPrintf(&pszPropertyName, "/VirtualBox/HostInfo/VRDP/Client/%u/User", u32ClientId);
-    if (RT_SUCCESS(rc))
-    {
-        mMachine->SetGuestProperty(Bstr(pszPropertyName).raw(), Bstr("").raw(),
-                                   bstrReadOnlyGuest.raw());
-        RTStrFree(pszPropertyName);
-    }
-
-    rc = RTStrAPrintf(&pszPropertyName, "/VirtualBox/HostInfo/VRDP/Client/%u/Domain", u32ClientId);
-    if (RT_SUCCESS(rc))
-    {
-        mMachine->SetGuestProperty(Bstr(pszPropertyName).raw(), Bstr("").raw(),
-                                   bstrReadOnlyGuest.raw());
-        RTStrFree(pszPropertyName);
-    }
-
-    char *pszClientId;
-    rc = RTStrAPrintf(&pszClientId, "%d", u32ClientId);
-    if (RT_SUCCESS(rc))
-    {
-        mMachine->SetGuestProperty(Bstr("/VirtualBox/HostInfo/VRDP/LastDisconnectedClient").raw(),
-                                   Bstr(pszClientId).raw(),
-                                   bstrReadOnlyGuest.raw());
-        RTStrFree(pszClientId);
-    }
+    char szPropNm[256];
+    RTStrPrintf(szPropNm, sizeof(szPropNm), "/VirtualBox/HostInfo/VRDP/Client/%u/Name", u32ClientId);
+    mMachine->SetGuestProperty(Bstr(szPropNm).raw(), Bstr("").raw(),
+                               bstrReadOnlyGuest.raw());
+
+    RTStrPrintf(szPropNm, sizeof(szPropNm), "/VirtualBox/HostInfo/VRDP/Client/%u/User", u32ClientId);
+    mMachine->SetGuestProperty(Bstr(szPropNm).raw(), Bstr("").raw(),
+                               bstrReadOnlyGuest.raw());
+
+    RTStrPrintf(szPropNm, sizeof(szPropNm), "/VirtualBox/HostInfo/VRDP/Client/%u/Domain", u32ClientId);
+    mMachine->SetGuestProperty(Bstr(szPropNm).raw(), Bstr("").raw(),
+                               bstrReadOnlyGuest.raw());
+
+    char szClientId[64];
+    RTStrPrintf(szClientId, sizeof(szClientId), "%d", u32ClientId);
+    mMachine->SetGuestProperty(Bstr("/VirtualBox/HostInfo/VRDP/LastDisconnectedClient").raw(),
+                               Bstr(szClientId).raw(),
+                               bstrReadOnlyGuest.raw());
 
     return;

trunk/src/VBox/Main/GuestImpl.cpp

@@ -505 +505 @@
 #ifdef VBOX_WITH_GUEST_CONTROL
 /**
- * Appends environment variables to the environment block. Each var=value pair is separated
- * by NULL (\0) sequence. The whole block will be stored in one blob and disassembled on the
- * guest side later to fit into the HGCM param structure.
+ * Appends environment variables to the environment block.
+ *
+ * Each var=value pair is separated by the null character ('\\0').  The whole
+ * block will be stored in one blob and disassembled on the guest side later to
+ * fit into the HGCM param structure.
  *
  * @returns VBox status code.
  *
- * @todo
- *
+ * @param   pszEnvVar       The environment variable=value to append to the
+ *                          environment block.
+ * @param   ppvList         This is actually a pointer to a char pointer
+ *                          variable which keeps track of the environment block
+ *                          that we're constructing.
+ * @param   pcbList         Pointer to the variable holding the current size of
+ *                          the environment block.  (List is a misnomer, go
+ *                          ahead a be confused.)
+ * @param   pcEnvVars       Pointer to the variable holding count of variables
+ *                          stored in the environment block.
  */
-int Guest::prepareExecuteEnv(const char *pszEnv, void **ppvList, uint32_t *pcbList, uint32_t *pcEnv)
+int Guest::prepareExecuteEnv(const char *pszEnv, void **ppvList, uint32_t *pcbList, uint32_t *pcEnvVars)
 {
     int rc = VINF_SUCCESS;
-    uint32_t cbLen = strlen(pszEnv);
+    uint32_t cchEnv = strlen(pszEnv); Assert(cchEnv >= 2);
     if (*ppvList)
     {
-        uint32_t cbNewLen = *pcbList + cbLen + 1; /* Include zero termination. */
-        char *pvTmp = (char*)RTMemRealloc(*ppvList, cbNewLen);
-        if (NULL == pvTmp)
-        {
+        uint32_t cbNewLen = *pcbList + cchEnv + 1; /* Include zero termination. */
+        char *pvTmp = (char *)RTMemRealloc(*ppvList, cbNewLen);
+        if (pvTmp == NULL)
             rc = VERR_NO_MEMORY;
-        }
         else
         {
-            memcpy(pvTmp + *pcbList, pszEnv, cbLen);
+            memcpy(pvTmp + *pcbList, pszEnv, cchEnv);
             pvTmp[cbNewLen - 1] = '\0'; /* Add zero termination. */
-            *ppvList = (void**)pvTmp;
+            *ppvList = (void **)pvTmp;
         }
     }
     else
     {
-        char *pcTmp;
-        if (RTStrAPrintf(&pcTmp, "%s", pszEnv) > 0)
-        {
-            *ppvList = (void**)pcTmp;
+        char *pszTmp;
+        if (RTStrAPrintf(&pszTmp, "%s", pszEnv) >= 0)
+        {
+            *ppvList = (void **)pszTmp;
             /* Reset counters. */
-            *pcEnv = 0;
+            *pcEnvVars = 0;
             *pcbList = 0;
         }
@@ -546 +554 @@
     if (RT_SUCCESS(rc))
     {
-        *pcbList += cbLen + 1; /* Include zero termination. */
-        *pcEnv += 1;           /* Increase env pairs count. */
+        *pcbList += cchEnv + 1; /* Include zero termination. */
+        *pcEnvVars += 1;        /* Increase env variable count. */
     }
     return rc;

trunk/src/VBox/Main/linux/USBProxyServiceLinux.cpp

@@ -169 +169 @@
      */
     int rc;
-    char *pszDevices;
-    RTStrAPrintf(&pszDevices, "%s/devices", mUsbfsRoot.c_str());
+    char *pszDevices = RTPathJoinA(mUsbfsRoot.c_str(), "devices");
     if (pszDevices)
     {

trunk/src/VBox/Runtime/common/misc/tar.cpp

@@ -1298 +1298 @@
 
         uint64_t cbOverallWritten = 0;
-        for(size_t i=0; i < cFiles; ++i)
+        for (size_t i = 0; i < cFiles; ++i)
         {
             RTTARFILE hFile;
@@ -1304 +1304 @@
             if (RT_FAILURE(rc))
                 break;
-            char *pszTargetFile;
-            rc = RTStrAPrintf(&pszTargetFile, "%s/%s", pszOutputDir, papszFiles[i]);
-            if (RT_FAILURE(rc))
-                break;
+            char *pszTargetFile = RTPathJoinA(pszOutputDir, papszFiles[i]);
+            if (!pszTargetFile)
+            {
+                rc = VERR_NO_STR_MEMORY;
+                break;
+            }
             rc = rtTarExtractFileToFile(hFile, pszTargetFile, cbOverallSize, cbOverallWritten, pfnProgressCallback, pvUser);
             RTStrFree(pszTargetFile);

trunk/src/VBox/Runtime/common/string/straprintf.cpp

@@ -140 +140 @@
 RTDECL(int) RTStrAPrintfVTag(char **ppszBuffer, const char *pszFormat, va_list args, const char *pszTag)
 {
+#ifdef IN_RING3
     char            szBuf[2048];
+#else
+    char            szBuf[256];
+#endif
     STRALLOCARG     Arg;
     Arg.fAllocated  = false;

trunk/src/VBox/Runtime/r3/posix/env-posix.cpp

@@ -103 +103 @@
     AssertReturn(!strchr(pszVar, '='), VERR_INVALID_PARAMETER);
 
-    /* Check that it exists first.  */
+    /*
+     * Check that it exists first.
+     */
     if (!RTEnvExist(pszVar))
         return VINF_ENV_VAR_NOT_FOUND;
 
-    /* Ok, try remove it. */
+    /*
+     * Ok, try remove it.
+     */
 #ifdef RT_OS_WINDOWS
-    /* Windows does not have unsetenv(). Clear the environment variable according to the MSN docs. */
-    char *pszBuf;
-    int rc = RTStrAPrintf(&pszBuf, "%s=", pszVar);
-    if (RT_FAILURE(rc))
-        return rc;
-    rc = putenv(pszBuf);
-    RTStrFree(pszBuf);
-    if (!rc)
+    /* Use putenv(var=) since Windows does not have unsetenv(). */
+    size_t cchVar = strlen(pszVar);
+    char *pszBuf = (char *)alloca(cchVar + 2);
+    memcpy(pszBuf, pszVar, cchVar);
+    pszBuf[cchVar]     = '=';
+    pszBuf[cchVar + 1] = '\0';
+
+    if (!putenv(pszBuf))
         return VINF_SUCCESS;
+
 #else
     /* This is the preferred function as putenv() like used above does neither work on Solaris nor on Darwin. */

trunk/src/VBox/Runtime/r3/xml.cpp

@@ -1045 +1045 @@
 AttributeNode* ElementNode::setAttribute(const char *pcszName, int32_t i)
 {
-    char *psz = NULL;
-    RTStrAPrintf(&psz, "%RI32", i);
-    AttributeNode *p = setAttribute(pcszName, psz);
-    RTStrFree(psz);
+    char szValue[64];
+    RTStrPrintf(szValue, sizeof(szValue), "%RI32", i);
+    AttributeNode *p = setAttribute(pcszName, szValue);
     return p;
 }
 
-AttributeNode* ElementNode::setAttribute(const char *pcszName, uint32_t i)
-{
-    char *psz = NULL;
-    RTStrAPrintf(&psz, "%RU32", i);
-    AttributeNode *p = setAttribute(pcszName, psz);
-    RTStrFree(psz);
+AttributeNode* ElementNode::setAttribute(const char *pcszName, uint32_t u)
+{
+    char szValue[64];
+    RTStrPrintf(szValue, sizeof(szValue), "%RU32", u);
+    AttributeNode *p = setAttribute(pcszName, szValue);
     return p;
 }
@@ -1063 +1061 @@
 AttributeNode* ElementNode::setAttribute(const char *pcszName, int64_t i)
 {
-    char *psz = NULL;
-    RTStrAPrintf(&psz, "%RI64", i);
-    AttributeNode *p = setAttribute(pcszName, psz);
-    RTStrFree(psz);
+    char szValue[64];
+    RTStrPrintf(szValue, sizeof(szValue), "%RI64", i);
+    AttributeNode *p = setAttribute(pcszName, szValue);
     return p;
 }
 
-AttributeNode* ElementNode::setAttribute(const char *pcszName, uint64_t i)
-{
-    char *psz = NULL;
-    RTStrAPrintf(&psz, "%RU64", i);
-    AttributeNode *p = setAttribute(pcszName, psz);
-    RTStrFree(psz);
+AttributeNode* ElementNode::setAttribute(const char *pcszName, uint64_t u)
+{
+    char szValue[64];
+    RTStrPrintf(szValue, sizeof(szValue), "%RU64", u);
+    AttributeNode *p = setAttribute(pcszName, szValue);
     return p;
 }
 
-AttributeNode* ElementNode::setAttributeHex(const char *pcszName, uint32_t i)
-{
-    char *psz = NULL;
-    RTStrAPrintf(&psz, "0x%RX32", i);
-    AttributeNode *p = setAttribute(pcszName, psz);
-    RTStrFree(psz);
+AttributeNode* ElementNode::setAttributeHex(const char *pcszName, uint32_t u)
+{
+    char szValue[64];
+    RTStrPrintf(szValue, sizeof(szValue), "0x%RX32", u);
+    AttributeNode *p = setAttribute(pcszName, szValue);
     return p;
 }

trunk/src/VBox/Runtime/testcase/tstDir-3.cpp

@@ -84 +84 @@
     const char *pszTestDir = ".";
 
-    char *pszFilter1 = NULL;
-    rc = RTStrAPrintf(&pszFilter1, "%s%c%s", pszTestDir, RTPATH_SLASH, "xyxzxq*");
-    if (RT_FAILURE(rc))
+    char *pszFilter1 = RTPathJoinA(pszTestDir, "xyxzxq*");
+    if (!pszFilter1)
     {
-        RTPrintf("tstDir-3: cannot create non-match filter! rc=%Rrc\n", rc);
+        RTPrintf("tstDir-3: cannot create non-match filter!\n");
         return 1;
     }
 
-    char *pszFilter2 = NULL;
-    rc = RTStrAPrintf(&pszFilter2, "%s%c%s", pszTestDir, RTPATH_SLASH, "*");
-    if (RT_FAILURE(rc))
+    char *pszFilter2 = RTPathJoinA(pszTestDir, "*");
+    if (!pszFilter2)
     {
-        RTPrintf("tstDir-3: cannot create match filter! rc=%Rrc\n", rc);
+        RTPrintf("tstDir-3: cannot create match filter!\n");
         return 1;
     }