Changeset 57469 in vbox for trunk/src/VBox

Timestamp:

Aug 20, 2015 9:07:56 AM (10 years ago)

Author:

vboxsync

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

102237

Message:

DnD: Fixed host->guest crashes on OS X hosts.

Location:

trunk/src/VBox/Main

Files:

• include/GuestDnDPrivate.h (modified) (2 diffs)
• src-client/GuestDnDTargetImpl.cpp (modified) (9 diffs)

trunk/src/VBox/Main/include/GuestDnDPrivate.h

@@ -107 +107 @@
     }
 
+    int Init(size_t cbBuf = _64K)
+    {
+        Reset();
+
+        pvScratchBuf = RTMemAlloc(cbBuf);
+        if (!pvScratchBuf)
+            return VERR_NO_MEMORY;
+
+        cbScratchBuf = cbBuf;
+        return VINF_SUCCESS;
+    }
+
+    void *const GetBufferMutable(void) { return pvScratchBuf; }
+
+    size_t GetBufferSize(void) { return cbScratchBuf; }
+
     void Reset(void)
     {
@@ -129 +145 @@
     /** Current object to receive. */
     DnDURIObject                    objURI;
+
+protected:
+
     /** Pointer to an optional scratch buffer to use for
      *  doing the actual chunk transfers. */

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

@@ -912 +912 @@
     uint32_t cbRead = 0;
 
-    int rc = pObject->Read(pCtx->mURI.pvScratchBuf, pCtx->mURI.cbScratchBuf, &cbRead);
+    int rc = pObject->Read(pCtx->mURI.GetBufferMutable(), pCtx->mURI.GetBufferSize(), &cbRead);
     if (RT_SUCCESS(rc))
     {
@@ -919 +919 @@
         if (mDataBase.mProtocolVersion <= 1)
         {
-            pMsg->setNextPointer(pCtx->mURI.pvScratchBuf, cbRead);  /* pvData */
-            pMsg->setNextUInt32(cbRead);                            /* cbData */
-            pMsg->setNextUInt32(pObject->GetMode());                   /* fMode */
+            pMsg->setNextPointer(pCtx->mURI.GetBufferMutable(), cbRead); /* pvData */
+            pMsg->setNextUInt32(cbRead);                                 /* cbData */
+            pMsg->setNextUInt32(pObject->GetMode());                     /* fMode */
         }
         else
         {
-            pMsg->setNextPointer(pCtx->mURI.pvScratchBuf, cbRead); /* pvData */
-            pMsg->setNextUInt32(cbRead);                           /* cbData */
+            pMsg->setNextPointer(pCtx->mURI.GetBufferMutable(), cbRead); /* pvData */
+            pMsg->setNextUInt32(cbRead);                                 /* cbData */
         }
 
@@ -1117 +1117 @@
     }
 
-    void *pvBuf = RTMemAlloc(mData.mcbBlockSize);
-    if (!pvBuf)
-        return VERR_NO_MEMORY;
-
-    int rc;
-
 #define REGISTER_CALLBACK(x)                                        \
     rc = pCtx->mpResp->setCallback(x, i_sendURIDataCallback, pCtx); \
@@ -1133 +1127 @@
         AssertRC(rc2);                                \
     }
+
+    int rc = pCtx->mURI.Init(mData.mcbBlockSize);
+    if (RT_FAILURE(rc))
+        return rc;
 
     rc = pCtx->mCallback.Reset();
@@ -1153 +1151 @@
     {
         /*
-         * Set our scratch buffer.
-         */
-        pCtx->mURI.pvScratchBuf = pvBuf;
-        pCtx->mURI.cbScratchBuf = mData.mcbBlockSize;
-
-        /*
          * Extract URI list from byte data.
          */
@@ -1172 +1164 @@
         URI_DATA_IS_VALID_BREAK(!lstURIOrg.isEmpty());
 
-        rc = lstURI.AppendURIPathsFromList(lstURIOrg, 0 /* fFlags */);
+        uint32_t fFlags = DNDURILIST_FLAGS_KEEP_OPEN;
+
+        rc = lstURI.AppendURIPathsFromList(lstURIOrg, fFlags);
         if (RT_SUCCESS(rc))
             LogFlowFunc(("URI root objects: %zu, total bytes (raw data to transfer): %zu\n",
@@ -1244 +1238 @@
     }
 
-    /* Destroy temporary scratch buffer. */
-    if (pvBuf)
-        RTMemFree(pvBuf);
-
 #undef URI_DATA_IS_VALID_BREAK
 
@@ -1259 +1249 @@
 
     DnDURIList &lstURI = pCtx->mURI.lstURI;
-
-    int rc;
 
     uint64_t cbTotal = pCtx->mData.cbToProcess;
@@ -1292 +1280 @@
                  fMode, pCurObj->GetSize(),
                  RTFS_IS_DIRECTORY(fMode), RTFS_IS_FILE(fMode)));
-
+    int rc;
     if (RTFS_IS_DIRECTORY(fMode))
     {