Changeset 84141 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

May 4, 2020 9:15:30 PM (5 years ago)

Author:

vboxsync

Message:

Main/Appliance: There should be no need to store two copies of the manifest. Also, we must not return unsanitized strings thru the API. IFF there is genuine need for non-sanitized data, we must return it as a BYTE array rather than a unicode string. bugref:9699

Location:

trunk/src/VBox/Main/src-server

Files:

• ApplianceImpl.cpp (modified) (1 diff)
• ApplianceImplImport.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-server/ApplianceImpl.cpp

@@ -507 +507 @@
 HRESULT Appliance::getManifest(com::Utf8Str &aManifest, com::Utf8Str &aManifestName)
 {
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    aManifest = m->strManifest;
+    /* Write lock the appliance here as we don't want concurrent hMemFileTheirManifest
+       accesses (lazyness/paranoia). */
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    Assert(aManifest.isEmpty());
+    if (m->hMemFileTheirManifest != NIL_RTVFSFILE)
+    {
+        uint64_t cchManifest = 0;
+        int rc = RTVfsFileQuerySize(m->hMemFileTheirManifest, &cchManifest);
+        AssertRCReturn(rc, setErrorVrc(rc));
+
+        rc = aManifest.reserveNoThrow(cchManifest + 1);
+        AssertRCReturn(rc, setErrorVrc(rc));
+
+        char *pszManifest = aManifest.mutableRaw();
+        rc = RTVfsFileReadAt(m->hMemFileTheirManifest, 0, pszManifest, cchManifest, NULL);
+        pszManifest[cchManifest] = '\0';
+        AssertRCReturn(rc, setErrorVrc(rc));
+        RTStrPurgeEncoding(pszManifest);
+        aManifest.jolt();
+    }
+
     aManifestName = m->strManifestName;
     return S_OK;

trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

@@ -2561 +2561 @@
  *                              reference is always consumed.
  * @param   pszSubFileNm        The manifest filename (no path) for error
- *                              messages and logging.
+ *                              messages, logging and strManifestName.
  * @returns COM status code, error info set.
  * @throws  Nothing
@@ -2570 +2570 @@
 
     /* Remember the manifet file name */
-    m->strManifestName.assign(pszSubFileNm);
+    HRESULT hrc = m->strManifestName.assignEx(pszSubFileNm);
+    AssertReturn(SUCCEEDED(hrc), hrc);
 
     /*
@@ -2583 +2584 @@
 
     /*
-     * Store the manifest as a string in the m->strManifest
-     */
-    {
-        char   abBuf[_16K];
-        size_t cbRead;
-
-        vrc = RTVfsFileRead(m->hMemFileTheirManifest, &abBuf, sizeof(abBuf), &cbRead);
-        if (RT_SUCCESS(vrc))
-            m->strManifest.assignEx((const char*)abBuf, cbRead);
-
-        /* Rewind to the beginning, because the manifest will be read later again */
-        RTVfsFileSeek(m->hMemFileTheirManifest, 0, RTFILE_SEEK_BEGIN, NULL);
-    }
-
-    /*
      * Parse the manifest.
      */
@@ -2609 +2595 @@
     RTVfsIoStrmRelease(hVfsIos);
     if (RT_FAILURE(vrc))
-        throw setErrorVrc(vrc, tr("Failed to parse manifest file '%s' for '%s' (%Rrc): %s"),
-                          pszSubFileNm, pTask->locInfo.strPath.c_str(), vrc, szErr);
+        return setErrorVrc(vrc, tr("Failed to parse manifest file '%s' for '%s' (%Rrc): %s"),
+                           pszSubFileNm, pTask->locInfo.strPath.c_str(), vrc, szErr);
 
     /*