Changeset 33464 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

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

Author:

vboxsync

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

67055

Message:

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

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxInternalManage.cpp (modified) (2 diffs)
• VBoxManageGuestCtrl.cpp (modified) (2 diffs)

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;