Changeset 84260 in vbox

Timestamp:

May 11, 2020 4:21:14 PM (5 years ago)

Author:

vboxsync

Message:

Guest Control: Implemented support for long(er) command lines [build fix]. ​​bugref:9320

File:

• trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp (modified) (3 diffs)

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

@@ -1113 +1113 @@
 
     /* Prepare environment.  The guest service dislikes the empty string at the end, so drop it. */
-    size_t  cbEnvBlock = 0; /* Shut up MSVC. */
-    char   *pszzEnvBlock;
+    size_t  cbEnvBlock   = 0;    /* Shut up MSVC. */
+    char   *pszzEnvBlock = NULL; /* Ditto. */
     if (RT_SUCCESS(vrc))
         vrc = mData.mProcess.mEnvironmentChanges.queryUtf8Block(&pszzEnvBlock, &cbEnvBlock);
@@ -1129 +1129 @@
         Assert(cbEnvBlock > 0);
         cbEnvBlock--;
+        AssertPtr(pszzEnvBlock);
 
         /* Prepare HGCM call. */
@@ -1177 +1178 @@
             AssertRC(rc2);
         }
-
+    }
+
+    if (pszzEnvBlock)
+    {
         mData.mProcess.mEnvironmentChanges.freeUtf8Block(pszzEnvBlock);
+        pszzEnvBlock = NULL;
     }