Changeset 33835 in vbox for trunk/src

Timestamp:

Nov 8, 2010 1:00:42 PM (14 years ago)

Author:

vboxsync

Message:

Main;Runtime: fix memory freeing returned by libxml2

Location:

trunk/src/VBox

Files:

• Main/ApplianceImplExport.cpp (modified) (1 diff)
• Runtime/r3/xml.cpp (modified) (2 diffs)

trunk/src/VBox/Main/ApplianceImplExport.cpp

@@ -1725 +1725 @@
             /* Write the ovf file to disk. */
             vrc = RTSha1WriteBuf(strOvfFile.c_str(), pvBuf, cbSize, pCallbacks, pStorage);
-            RTMemFree(pvBuf);
             if (RT_FAILURE(vrc))
                 throw setError(VBOX_E_FILE_ERROR,

trunk/src/VBox/Runtime/r3/xml.cpp

@@ -1463 +1463 @@
 
 XmlMemWriter::XmlMemWriter()
+  : m_pBuf(0)
 {
 }
@@ -1468 +1469 @@
 XmlMemWriter::~XmlMemWriter()
 {
+    if (m_pBuf)
+        xmlFree(m_pBuf);
 }
 
 void XmlMemWriter::write(const Document &doc, void **ppvBuf, size_t *pcbSize)
 {
-    xmlChar* pBuf;
+    if (m_pBuf)
+    {
+        xmlFree(m_pBuf);
+        m_pBuf = 0;
+    }
     int size;
-    xmlDocDumpFormatMemory(doc.m->plibDocument, &pBuf, &size, 1);
-    *ppvBuf = pBuf;
+    xmlDocDumpFormatMemory(doc.m->plibDocument, (xmlChar**)&m_pBuf, &size, 1);
+    *ppvBuf = m_pBuf;
     *pcbSize = size;
 }