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

Timestamp:

Jun 14, 2020 7:33:20 PM (5 years ago)

Author:

vboxsync

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

138628

Message:

Guest Control/VbglR3: Tried fixing bailing out from starting guest processes with too long environment blocks / arguments / command lines. bugref:9320

File:

• trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp

@@ -1289 +1289 @@
         pStartupInfo->cb##a_Str  = RT_MAX(pStartupInfo->cb##a_Str * cGrowthFactor, a_cbMax);
 
+                /* We can't tell which parameter doesn't fit, so we have to resize all. */
                 GROW_STR(Cmd , GUESTPROCESS_MAX_CMD_LEN);
                 GROW_STR(Args, GUESTPROCESS_MAX_ARGS_LEN);
@@ -1294 +1295 @@
 
 #undef GROW_STR
+                LogRel2(("VbglR3GuestCtrlProcGetStart: %Rrc (retry %u, cbCmd=%RU32, cbArgs=%RU32, cbEnv=%RU32)\n",
+                         rc, cRetries, pStartupInfo->cbCmd, pStartupInfo->cbArgs, pStartupInfo->cbEnv));
+
+                /* Only try another round if we can peek for the next bigger size; otherwise bail out on the bottom. */
+                if (g_fVbglR3GuestCtrlHavePeekGetCancel)
+                    continue;
             }
             else