Changeset 33320 in vbox

Timestamp:

Oct 21, 2010 5:09:15 PM (14 years ago)

Author:

vboxsync

Message:

Main-OVF: memory leaks

Location:

trunk/src/VBox/Main

Files:

• ApplianceImplExport.cpp (modified) (2 diffs)
• ApplianceImplImport.cpp (modified) (1 diff)

trunk/src/VBox/Main/ApplianceImplExport.cpp

@@ -1736 +1736 @@
             // Now fully build a valid ovf document in memory
             buildXML(writeLock, doc, stack, pTask->locInfo.strPath, pTask->enFormat);
+            /* Extract the path */
+            Utf8Str strOvfFile = Utf8Str(pTask->locInfo.strPath).stripExt().append(".ovf");
             // Create a memory buffer containing the XML. */
-            void *pvBuf;
+            void *pvBuf = 0;
             size_t cbSize;
             xml::XmlMemWriter writer;
             writer.write(doc, &pvBuf, &cbSize);
-            /* Extract the path */
-            Utf8Str tmpPath = pTask->locInfo.strPath;
-            /* Remove the extension and add ovf. */
-            tmpPath.stripExt()
-                .append(".ovf");
+            if (RT_UNLIKELY(!pvBuf))
+                throw setError(VBOX_E_FILE_ERROR,
+                               tr("Could not create OVF file '%s'"),
+                               strOvfFile.c_str());
             /* Write the ovf file to disk. */
-            vrc = Sha1WriteBuf(tmpPath.c_str(), pvBuf, cbSize, pCallbacks, pStorage);
+            vrc = Sha1WriteBuf(strOvfFile.c_str(), pvBuf, cbSize, pCallbacks, pStorage);
+            RTMemFree(pvBuf);
             if (RT_FAILURE(vrc))
                 throw setError(VBOX_E_FILE_ERROR,
                                tr("Could not create OVF file '%s' (%Rrc)"),
-                               tmpPath.c_str(), vrc);
-            fileList.push_back(STRPAIR(tmpPath, pStorage->strDigest));
+                               strOvfFile.c_str(), vrc);
+            fileList.push_back(STRPAIR(strOvfFile, pStorage->strDigest));
         }
 
@@ -1840 +1842 @@
             // Create & write the manifest file
             Utf8Str strMfFilePath = Utf8Str(pTask->locInfo.strPath).stripExt().append(".mf");
-            Utf8Str strMfFileName = Utf8Str(strMfFilePath)
-                .stripPath();
+            Utf8Str strMfFileName = Utf8Str(strMfFilePath).stripPath();
             pTask->pProgress->SetNextOperation(BstrFmt(tr("Creating manifest file '%s'"), strMfFileName.c_str()).raw(),
                                                m->ulWeightForManifestOperation);     // operation's weight, as set up with the IProgress originally);

trunk/src/VBox/Main/ApplianceImplImport.cpp

@@ -2490 +2490 @@
     if (FAILED(rc)) throw rc;
 
-    // return the new machine as an IMachine
-    IMachine *p;
-    rc = pNewMachine.queryInterfaceTo(&p);
-    if (FAILED(rc)) throw rc;
-    pReturnNewMachine = p;
+    pReturnNewMachine = ComPtr<IMachine>(pNewMachine);
 
     // and register it