Changeset 28029 in vbox

Timestamp:

Apr 7, 2010 7:31:23 AM (15 years ago)

Author:

vboxsync

Message:

Guest Control/VBoxService+Main: Bugfix for multiple environment blocks.

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp (modified) (3 diffs)
• Additions/common/VBoxService/VBoxServiceControl.cpp (modified) (3 diffs)
• Additions/common/VBoxService/VBoxServiceControlExec.cpp (modified) (1 diff)
• Main/GuestImpl.cpp (modified) (3 diffs)

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

@@ -157 +157 @@
                                               uint32_t *puTimeLimit)
 {
+    AssertPtr(pszCmd);
+    AssertPtr(puFlags);
+    AssertPtr(pszArgs);
+    AssertPtr(puNumArgs);
+    AssertPtr(pszEnv);
+    AssertPtr(pcbEnv);
+    AssertPtr(puNumEnvVars);
+    AssertPtr(pszStdIn);
+    AssertPtr(pszStdOut);
+    AssertPtr(pszStdOut);
+    AssertPtr(pszStdErr);
+    AssertPtr(pszUser);
+    AssertPtr(pszPassword);
+    AssertPtr(puTimeLimit);
+
     VBoxGuestCtrlHGCMMsgExecCmd Msg;
 
@@ -169 +184 @@
     VbglHGCMParmPtrSet(&Msg.args, pszArgs, cbArgs);
     VbglHGCMParmUInt32Set(&Msg.num_env, 0);
+    VbglHGCMParmUInt32Set(&Msg.cb_env, 0);
     VbglHGCMParmPtrSet(&Msg.env, pszEnv, *pcbEnv);
     VbglHGCMParmPtrSet(&Msg.std_in, pszStdIn, cbStdIn);
@@ -185 +201 @@
         Msg.num_args.GetUInt32(puNumArgs);
         Msg.num_env.GetUInt32(puNumEnvVars);
-        Msg.timeout.GetUInt32(puTimeLimit);
+        Msg.cb_env.GetUInt32(pcbEnv);
+        Msg.timeout.GetUInt32(puTimeLimit);        
     }
     return rc;

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

@@ -139 +139 @@
                 char *pcCur = execData.szEnv;
                 uint32_t i = 0;
-                while (pcCur < execData.szEnv + execData.cbEnv)
+                uint32_t cbLen = 0;
+                while (cbLen < execData.cbEnv)
                 {
                     if (RTStrAPrintf(&ppaEnv[i++], "%s", pcCur) < 0)
@@ -146 +147 @@
                         break;
                     }
-                    pcCur += strlen(pcCur) + 1; /* Skip terminating zero. */
+                    cbLen += strlen(pcCur) + 1; /* Skip terminating zero. */
+                    pcCur += cbLen;
                 }
             }
@@ -154 +156 @@
                 /* Do the actual execution. */
                 rc = VBoxServiceControlExecProcess(&execData, ppaArg, ppaEnv);
-                for (uint32_t i = 0; i < execData.uNumEnvVars; i++)
-                    RTStrFree(ppaEnv[i]);
-                RTMemFree(ppaEnv);
+                /* Cleanup. */
+                if (execData.uNumEnvVars)
+                {
+                    for (uint32_t i = 0; i < execData.uNumEnvVars; i++)
+                        RTStrFree(ppaEnv[i]);
+                    RTMemFree(ppaEnv);
+                }
             }
             RTGetOptArgvFree(ppaArg);

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

@@ -515 +515 @@
         for (i = 0; i < pExecData->uNumEnvVars; i++)
         {
-            // @todo rc = RTEnvPutEx(hEnv, pExecData->[i]);
+            rc = RTEnvPutEx(hEnv, papszEnv[i]);
             if (RT_FAILURE(rc))
                 break;

trunk/src/VBox/Main/GuestImpl.cpp

@@ -493 +493 @@
     
                 void *pvEnv = NULL;
-                uint32_t uNumEnv = env.size();
+                uint32_t uNumEnv = 0;
                 uint32_t cbEnv = 0;
     
-                for (unsigned i = 0; i < uNumEnv; i++)
+                for (unsigned i = 0; i < env.size(); i++)
                 {
                     vrc = prepareExecuteEnv(Utf8Str(env[i]).raw(), &pvEnv, &cbEnv, &uNumEnv);
@@ -511 +511 @@
                     Utf8Str Utf8Password(aPassword);
                 
-                    VBOXHGCMSVCPARM paParms[13];
+                    VBOXHGCMSVCPARM paParms[14];
                     int i = 0;
                     paParms[i++].setPointer((void*)Utf8Command.raw(), (uint32_t)strlen(Utf8Command.raw()) + 1);
@@ -518 +518 @@
                     paParms[i++].setPointer((void*)pszArgs, cbArgs);
                     paParms[i++].setUInt32(uNumEnv);
+                    paParms[i++].setUInt32(cbEnv);
                     paParms[i++].setPointer((void*)pvEnv, cbEnv);
                     paParms[i++].setPointer((void*)Utf8StdIn.raw(), (uint32_t)strlen(Utf8StdIn.raw()) + 1);