Changeset 28029 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib

Timestamp:

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

Author:

vboxsync

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

59736

Message:

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

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.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;