Changeset 103429 in vbox

Timestamp:

Feb 19, 2024 11:59:36 AM (9 months ago)

Author:

vboxsync

Message:

Main/PerformanceLinux.cpp: Avoid re-doing overflow checks too many times. Todos. bugref:3409

File:

• trunk/src/VBox/Main/src-server/linux/PerformanceLinux.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/linux/PerformanceLinux.cpp

@@ -49 +49 @@
 #include "Performance.h"
 
-#define VBOXVOLINFO_NAME "VBoxVolInfo"
+#define VBOXVOLINFO_EXE_NAME "VBoxVolInfo"
 
 namespace pm {
@@ -524 +524 @@
 void CollectorLinux::addVolumeDependencies(const char *pcszVolume, DiskList& listDisks)
 {
+    /** @todo r=bird: This is presumptive and will misbehave if someone puts VBox
+     *        in directory which path contains spaces or other problematic
+     *        characters.  This is one of the reasons to avoid popen(). */
+    static const char s_szSlashExeNameSpace[] = "/" VBOXVOLINFO_EXE_NAME " ";
+    size_t const cchVolume = strlen(pcszVolume);
     char szVolInfo[RTPATH_MAX];
-    int vrc = RTPathAppPrivateArch(szVolInfo, sizeof(szVolInfo) - sizeof("/" VBOXVOLINFO_NAME " ") - strlen(pcszVolume));
+    int vrc = RTPathAppPrivateArch(szVolInfo, sizeof(szVolInfo) - sizeof(s_szSlashExeNameSpace) - cchVolume);
     if (RT_FAILURE(vrc))
     {
         LogRel(("VolInfo: Failed to get program path, vrc=%Rrc\n", vrc));
+        /** @todo r=bird: inconsistent failure behaviour. if popen fails, volume is
+         *        pushed onto the list, while here it isn't. */
         return;
     }
-    vrc = RTStrCat(szVolInfo, sizeof(szVolInfo), "/" VBOXVOLINFO_NAME " ");
-    AssertRCReturnVoid(vrc);
-    vrc = RTStrCat(szVolInfo, sizeof(szVolInfo), pcszVolume);
-    AssertRCReturnVoid(vrc);
+    memcpy(mempcpy(strchr(szVolInfo, '\0'), s_szSlashExeNameSpace, sizeof(s_szSlashExeNameSpace) - 1),
+           pcszVolume, cchVolume + 1);
 
     FILE *fp = popen(szVolInfo, "r");