Changeset 101014 in vbox for trunk/src/VBox/Main

Timestamp:

Sep 4, 2023 9:00:08 PM (16 months ago)

Author:

vboxsync

Message:

Main/src-client/ConsoleImplConfig*: Polishing. More obvious buffer limit and error checking.

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImplConfigArmV8.cpp (modified) (1 diff)
• ConsoleImplConfigX86.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/ConsoleImplConfigArmV8.cpp

@@ -331 +331 @@
         // VBoxC is located in the components subdirectory
         char szPathVBoxC[RTPATH_MAX];
-        vrc = RTPathAppPrivateArch(szPathVBoxC, RTPATH_MAX - sizeof("/components/VBoxC"));  AssertRC(vrc);
-        strcat(szPathVBoxC, "/components/VBoxC");
+        vrc = RTPathAppPrivateArch(szPathVBoxC, RTPATH_MAX);                                VRC();
+        vrc = RTPathAppend(szPathVBoxC, RTPATH_MAX, "/components/VBoxC");                   VRC();
         InsertConfigString(pMod,   "Path",  szPathVBoxC);
 #else

trunk/src/VBox/Main/src-client/ConsoleImplConfigX86.cpp

@@ -308 +308 @@
 #define MAX_DEVICES     30
 #define H()     AssertLogRelMsgReturn(!FAILED(hrc), ("hrc=%Rhrc\n", hrc), VERR_MAIN_CONFIG_CONSTRUCTOR_COM_ERROR)
+#define VRC()   AssertLogRelMsgReturn(RT_SUCCESS(vrc), ("vrc=%Rrc\n", vrc), vrc)
 
     LONG lPortLUN[MAX_BIOS_LUN_COUNT];
@@ -1165 +1166 @@
         // VBoxC is located in the components subdirectory
         char szPathVBoxC[RTPATH_MAX];
-        vrc = RTPathAppPrivateArch(szPathVBoxC, RTPATH_MAX - sizeof("/components/VBoxC"));  AssertRC(vrc);
-        strcat(szPathVBoxC, "/components/VBoxC");
+        vrc = RTPathAppPrivateArch(szPathVBoxC, RTPATH_MAX);                                VRC();
+        vrc = RTPathAppend(szPathVBoxC, RTPATH_MAX, "/components/VBoxC");                   VRC();
         InsertConfigString(pMod,   "Path",  szPathVBoxC);
 #else