Changeset 84150 in vbox for trunk/src/VBox/Additions

Timestamp:

May 5, 2020 5:48:08 PM (5 years ago)

Author:

vboxsync

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

137750

Message:

Guest Control/VBoxService: Also made attribute allocation of VBOXSERVICECTRLSESSIONSTARTUPINFO + VBOXSERVICECTRLPROCSTARTUPINFO dynamic. bugref:9320

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceControl.h (modified) (2 diffs)
• VBoxServiceControlProcess.cpp (modified) (6 diffs)
• VBoxServiceControlSession.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControl.h

@@ -337 +337 @@
  * @{ */
 extern int                      VgsvcGstCtrlSessionStartupInfoInit(PVBOXSERVICECTRLSESSIONSTARTUPINFO pStartupInfo);
+extern int                      VgsvcGstCtrlSessionStartupInfoInitEx(PVBOXSERVICECTRLSESSIONSTARTUPINFO pStartupInfo, size_t cbUser, size_t cbPassword, size_t cbDomain);
 extern void                     VgsvcGstCtrlSessionStartupInfoDestroy(PVBOXSERVICECTRLSESSIONSTARTUPINFO pStartupInfo);
 
@@ -352 +353 @@
  * @{ */
 extern int                      VgsvcGstCtrlProcessStartupInfoInit(PVBOXSERVICECTRLPROCSTARTUPINFO pStartupInfo);
-extern int                      VgsvcGstCtrlProcessStartupInfoInitEx(PVBOXSERVICECTRLPROCSTARTUPINFO pStartupInfo, size_t cbEnv, size_t cbArgs);
+extern int                      VgsvcGstCtrlProcessStartupInfoInitEx(PVBOXSERVICECTRLPROCSTARTUPINFO pStartupInfo, size_t cbCmd, size_t cbUser, size_t cbPassword, size_t cbDomain, size_t cbArgs, size_t cbEnv);
 extern void                     VgsvcGstCtrlProcessStartupInfoDestroy(PVBOXSERVICECTRLPROCSTARTUPINFO pStartupInfo);
 extern void                     VgsvcGstCtrlProcessStartupInfoFree(PVBOXSERVICECTRLPROCSTARTUPINFO pStartupInfo);

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

@@ -66 +66 @@
  * @returns VBox status code.
  * @param   pStartupInfo        Process startup info to initializes.
+ * @param   cbCmd               Size (in bytes) to use for the command buffer.
+ * @param   cbUser              Size (in bytes) to use for the user name buffer.
+ * @param   cbPassword          Size (in bytes) to use for the password buffer.
+ * @param   cbDomain            Size (in bytes) to use for the domain buffer.
  * @param   cbArgs              Size (in bytes) to use for the arguments buffer.
  * @param   cbEnv               Size (in bytes) to use for the environment buffer.
  */
 int VgsvcGstCtrlProcessStartupInfoInitEx(PVBOXSERVICECTRLPROCSTARTUPINFO pStartupInfo,
+                                         size_t cbCmd,
+                                         size_t cbUser, size_t cbPassword, size_t cbDomain,
                                          size_t cbArgs, size_t cbEnv)
 {
     AssertPtrReturn(pStartupInfo, VERR_INVALID_POINTER);
+    AssertReturn(cbCmd,           VERR_INVALID_PARAMETER);
+    AssertReturn(cbUser,          VERR_INVALID_PARAMETER);
+    AssertReturn(cbPassword,      VERR_INVALID_PARAMETER);
+    AssertReturn(cbDomain,        VERR_INVALID_PARAMETER);
     AssertReturn(cbArgs,          VERR_INVALID_PARAMETER);
     AssertReturn(cbEnv,           VERR_INVALID_PARAMETER);
@@ -88 +98 @@
     do
     {
-        ALLOC_STR(Cmd,      sizeof(char) * GUESTPROCESS_MAX_CMD_LEN);
+        ALLOC_STR(Cmd,      cbCmd);
         ALLOC_STR(Args,     cbArgs);
         ALLOC_STR(Env,      cbEnv);
-        ALLOC_STR(User,     sizeof(char) * GUESTPROCESS_MAX_USER_LEN);
-        ALLOC_STR(Password, sizeof(char) * GUESTPROCESS_MAX_PASSWORD_LEN);
-        ALLOC_STR(Domain,   sizeof(char) * GUESTPROCESS_MAX_DOMAIN_LEN);
+        ALLOC_STR(User,     cbUser);
+        ALLOC_STR(Password, cbPassword);
+        ALLOC_STR(Domain,   cbDomain);
 
         return VINF_SUCCESS;
@@ -113 +123 @@
 {
     return VgsvcGstCtrlProcessStartupInfoInitEx(pStartupInfo,
+                                                GUESTPROCESS_MAX_CMD_LEN,
+                                                GUESTPROCESS_MAX_USER_LEN,  GUESTPROCESS_MAX_PASSWORD_LEN,
+                                                GUESTPROCESS_MAX_DOMAIN_LEN,
                                                 GUESTPROCESS_MAX_ARGS_LEN, GUESTPROCESS_MAX_ENV_LEN);
 }
@@ -179 +192 @@
     if (pStartupInfo->cb##a_Str) \
     { \
+        pStartupInfoDup->psz##a_Str = (char *)RTStrDup(pStartupInfo->psz##a_Str); \
+        AssertPtrBreak(pStartupInfoDup->psz##a_Str); \
+        pStartupInfoDup->cb##a_Str  = strlen(pStartupInfoDup->psz##a_Str) + 1 /* Include terminator */; \
+    }
+
+#define DUP_MEM(a_Str) \
+    if (pStartupInfo->cb##a_Str) \
+    { \
         pStartupInfoDup->psz##a_Str = (char *)RTMemDup(pStartupInfo->psz##a_Str, pStartupInfo->cb##a_Str); \
         AssertPtrBreak(pStartupInfoDup->psz##a_Str); \
@@ -185 +206 @@
 
             DUP_STR(Cmd);
-            DUP_STR(Args);
-            DUP_STR(Env);
+            DUP_MEM(Args);
+            DUP_MEM(Env);
             DUP_STR(User);
             DUP_STR(Password);
@@ -192 +213 @@
 
 #undef DUP_STR
+#undef DUP_MEM
 
             return pStartupInfoDup;

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

@@ -1035 +1035 @@
 
 /**
- * Initializes a session startup info.
+ * Initializes a session startup info, extended version.
  *
  * @returns VBox status code.
  * @param   pStartupInfo        Session startup info to initializes.
- */
-int VgsvcGstCtrlSessionStartupInfoInit(PVBOXSERVICECTRLSESSIONSTARTUPINFO pStartupInfo)
+ * @param   cbUser              Size (in bytes) to use for the user name buffer.
+ * @param   cbPassword          Size (in bytes) to use for the password buffer.
+ * @param   cbDomain            Size (in bytes) to use for the domain name buffer.
+ */
+int VgsvcGstCtrlSessionStartupInfoInitEx(PVBOXSERVICECTRLSESSIONSTARTUPINFO pStartupInfo,
+                                         size_t cbUser, size_t cbPassword, size_t cbDomain)
 {
     AssertPtrReturn(pStartupInfo, VERR_INVALID_POINTER);
@@ -1056 +1060 @@
     do
     {
-        ALLOC_STR(User,     sizeof(char) * GUESTPROCESS_MAX_USER_LEN);
-        ALLOC_STR(Password, sizeof(char) * GUESTPROCESS_MAX_PASSWORD_LEN);
-        ALLOC_STR(Domain,   sizeof(char) * GUESTPROCESS_MAX_DOMAIN_LEN);
+        ALLOC_STR(User,     cbUser);
+        ALLOC_STR(Password, cbPassword);
+        ALLOC_STR(Domain,   cbDomain);
 
         return VINF_SUCCESS;
@@ -1068 +1072 @@
     VgsvcGstCtrlSessionStartupInfoDestroy(pStartupInfo);
     return VERR_NO_MEMORY;
+}
+
+/**
+ * Initializes a session startup info.
+ *
+ * @returns VBox status code.
+ * @param   pStartupInfo        Session startup info to initializes.
+ */
+int VgsvcGstCtrlSessionStartupInfoInit(PVBOXSERVICECTRLSESSIONSTARTUPINFO pStartupInfo)
+{
+    return VgsvcGstCtrlSessionStartupInfoInitEx(pStartupInfo,
+                                                GUESTPROCESS_MAX_USER_LEN, GUESTPROCESS_MAX_PASSWORD_LEN,
+                                                GUESTPROCESS_MAX_DOMAIN_LEN);
 }
 
@@ -1127 +1144 @@
     if (pStartupInfo->cb##a_Str) \
     { \
-        pStartupInfoDup->psz##a_Str = (char *)RTMemDup(pStartupInfo->psz##a_Str, pStartupInfo->cb##a_Str); \
+        pStartupInfoDup->psz##a_Str = (char *)RTStrDup(pStartupInfo->psz##a_Str); \
         AssertPtrBreak(pStartupInfoDup->psz##a_Str); \
-        pStartupInfoDup->cb##a_Str  = pStartupInfo->cb##a_Str; \
+        pStartupInfoDup->cb##a_Str  = strlen(pStartupInfoDup->psz##a_Str) + 1 /* Include terminator */; \
     }
             DUP_STR(User);