Changeset 38182 in vbox for trunk/src/VBox/Main

Timestamp:

Jul 26, 2011 12:38:36 PM (14 years ago)

Author:

vboxsync

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

73140

Message:

GuestCtrl/Main: Respect VERR_MAX_PROCS_REACHED, adjusted assertions for parsing the guest stream buffer.

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestCtrlIO.cpp (modified) (1 diff)
• GuestCtrlImpl.cpp (modified) (1 diff)

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

@@ -218 +218 @@
 int GuestProcessStream::Parse()
 {
-    AssertPtrReturn(m_pbBuffer, VERR_INVALID_POINTER);
-    AssertReturn(m_cbSize, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(m_pbBuffer, VINF_SUCCESS);
+    AssertReturn(m_cbSize, VINF_SUCCESS);
     AssertReturn(m_cbParserOffset < m_cbSize, VERR_INVALID_PARAMETER);
 

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

@@ -2051 +2051 @@
                     rc = setErrorNoLog(VBOX_E_IPRT_ERROR,
                                        tr("Invalid user/password credentials"));
+                else if (vrc == VERR_MAX_PROCS_REACHED)
+                    rc = setErrorNoLog(VBOX_E_IPRT_ERROR,
+                                       tr("Concurrent guest process limit is reached"));
                 else
                 {