Changeset 39791 in vbox

Timestamp:

Jan 18, 2012 10:50:49 AM (13 years ago)

Author:

vboxsync

Message:

GuestCtrlIO: Fixed parsing result to be VERR_MORE_DATA when entering a new *and* incomplete stream block.

File:

• trunk/src/VBox/Main/src-client/GuestCtrlIO.cpp (modified) (2 diffs)

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

@@ -355 +355 @@
     int rc = VINF_SUCCESS;
 
-    char *pszOff   = (char*)&m_pbBuffer[m_cbOffset];
-    char *pszStart = pszOff;
+    char    *pszOff    = (char*)&m_pbBuffer[m_cbOffset];
+    char    *pszStart  = pszOff;
+    uint32_t uDistance;
     while (*pszStart)
     {
         size_t pairLen = strlen(pszStart);
-        if ((pszStart - pszOff) + pairLen + 1 >= m_cbSize)
+        uDistance = (pszStart - pszOff);
+        if (m_cbOffset + uDistance + pairLen + 1 >= m_cbSize)
         {
             rc = VERR_MORE_DATA;
@@ -393 +395 @@
      * in our buffer just skip the current termination so that
      * we can try next time. */
-    uint32_t uDistance = (pszStart - pszOff);
+    uDistance = (pszStart - pszOff);
     if (   !uDistance
         && *pszStart == '\0'