Changeset 28571 in vbox

Timestamp:

Apr 21, 2010 6:06:34 PM (15 years ago)

Author:

vboxsync

Message:

Guest Control: fix two assertions in debug mode

File:

• trunk/src/VBox/Main/GuestImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/GuestImpl.cpp

@@ -591 +591 @@
         pCBData->u32HandleId = pData->u32HandleId;
         pCBData->u32Flags = pData->u32Flags;
-        
+
         /* Allocate data buffer and copy it */
         if (pData->cbData && pData->pvData)
@@ -731 +731 @@
 
         /* Prepare arguments. */
-        com::SafeArray<IN_BSTR> args(ComSafeArrayInArg(aArguments));
-        uint32_t uNumArgs = args.size();
         char **papszArgv = NULL;
-        if(uNumArgs > 0)
-        {
+        uint32_t uNumArgs = 0;
+        if(aArguments > 0)
+        {
+            com::SafeArray<IN_BSTR> args(ComSafeArrayInArg(aArguments));
+            uNumArgs = args.size();
             papszArgv = (char**)RTMemAlloc(sizeof(char*) * (uNumArgs + 1));
             AssertPtr(papszArgv);
@@ -760 +761 @@
 
                 /* Prepare environment. */
-                com::SafeArray<IN_BSTR> env(ComSafeArrayInArg(aEnvironment));
-
                 void *pvEnv = NULL;
                 uint32_t uNumEnv = 0;
                 uint32_t cbEnv = 0;
-
-                for (unsigned i = 0; i < env.size(); i++)
+                if (aEnvironment > 0)
                 {
-                    vrc = prepareExecuteEnv(Utf8Str(env[i]).raw(), &pvEnv, &cbEnv, &uNumEnv);
-                    if (RT_FAILURE(vrc))
-                        break;
+                    com::SafeArray<IN_BSTR> env(ComSafeArrayInArg(aEnvironment));
+
+                    for (unsigned i = 0; i < env.size(); i++)
+                    {
+                        vrc = prepareExecuteEnv(Utf8Str(env[i]).raw(), &pvEnv, &cbEnv, &uNumEnv);
+                        if (RT_FAILURE(vrc))
+                            break;
+                    }
                 }
 
@@ -993 +996 @@
                 outputData.resize(pData->cbData);
 
-            /* Fill output in supplied out buffer. */  
+            /* Fill output in supplied out buffer. */
             memcpy(outputData.raw(), pData->pvData, pData->cbData);
             outputData.resize(pData->cbData); /* Shrink to fit actual buffer size. */