Changeset 36743 in vbox

Timestamp:

Apr 20, 2011 9:56:27 AM (14 years ago)

Author:

vboxsync

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

71274

Message:

HostServices/GuestCtrl: More checks for empty buffers, drop host message if client did not understand it a second time.

File:

• trunk/src/VBox/HostServices/GuestControl/service.cpp (modified) (4 diffs)

trunk/src/VBox/HostServices/GuestControl/service.cpp

@@ -360 +360 @@
                                        pBuf->pParms[i].u.pointer.size);
                         }
+                        else
+                        {
+                            /* Size is 0 -- make sure we don't have any pointer. */
+                            pBuf->pParms[i].u.pointer.addr = NULL;
+                        }
                         break;
 
@@ -413 +418 @@
     if (cParms != pBuf->uParmCount)
     {
-        LogFlowFunc(("Parameter count does not match (%u (buffer), %u (guest))\n",
+        LogFlowFunc(("Parameter count does not match: %u (host) vs. %u (guest)\n",
                      pBuf->uParmCount, cParms));
         rc = VERR_INVALID_PARAMETER;
@@ -436 +441 @@
                     if (paParms[i].u.pointer.size >= pBuf->pParms[i].u.pointer.size)
                     {
-                        memcpy(paParms[i].u.pointer.addr,
-                               pBuf->pParms[i].u.pointer.addr,
-                               pBuf->pParms[i].u.pointer.size);
+                        /* Only copy buffer if there actually is something to copy. */
+                        if (pBuf->pParms[i].u.pointer.size)
+                        {
+                            AssertPtr(pBuf->pParms[i].u.pointer.addr);
+                            memcpy(paParms[i].u.pointer.addr,
+                                   pBuf->pParms[i].u.pointer.addr,
+                                   pBuf->pParms[i].u.pointer.size);
+                        }
                     }
                     else
@@ -644 +654 @@
              }
          }
+         else
+         {
+            /* Client did not understand the message or something else weird happened. Try again one
+             * more time and drop it if it didn't get handled then. */
+             if (++curCmd.mTries > 1)
+             {
+                 paramBufferFree(&curCmd.mParmBuf);
+                 mHostCmds.pop_front();
+             }
+         }
     }
     return rc;