Changeset 55525 in vbox

Timestamp:

Apr 29, 2015 3:21:19 PM (9 years ago)

Author:

vboxsync

Message:

DnD: Handle receiving 0-byte files, only do workaround accounting on root URI objects.

File:

• trunk/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp (modified) (4 diffs)

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

@@ -511 +511 @@
         {
             /*
-             * BUG: Protocol v1 does *not* send directory names in URI format,
-             *      however, if this in a root URI directory (which came with the initial
+             * BUG: Protocol v1 does *not* send root directory names in URI format,
+             *      however, if this is a root URI directory (which came with the initial
              *      GUEST_DND_GH_SND_DATA message(s)) the total data announced was for
              *      root directory names which came in URI format, as an URI list.
@@ -523 +523 @@
             if (pszPathURI)
             {
-                cbPath  = strlen(pszPathURI);
-                cbPath += 3;                  /* Include "\r" + "\n" + termination -- see above. */
-
-                LogFlowFunc(("URI pszPathURI=%s, cbPathURI=%RU32\n", pszPathURI, cbPath));
+                bool fHasPath = RTPathHasPath(pszPath); /* Use original data received. */
+                if (!fHasPath) /* Root path? */
+                {
+                    cbPath  = strlen(pszPathURI);
+                    cbPath += 3;                  /* Include "\r" + "\n" + termination -- see above. */
+
+                    rc = i_updateProcess(pCtx, cbPath);
+                }
+
+                LogFlowFunc(("URI pszPathURI=%s, fHasPath=%RTbool, cbPath=%RU32\n", pszPathURI, fHasPath, cbPath));
                 RTStrFree(pszPathURI);
             }
@@ -532 +538 @@
                 rc = VERR_NO_MEMORY;
         }
-
-        if (RT_SUCCESS(rc))
-            rc = i_updateProcess(pCtx, cbPath);
     }
 
@@ -599 +602 @@
             if (mDataBase.mProtocolVersion >= 2)
                 rc = pCtx->mURI.objURI.SetSize(cbSize);
+
+            if (!cbSize) /* 0-byte file? Close again. */
+                pCtx->mURI.objURI.Close();
         }
         else