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

Timestamp:

Apr 26, 2024 2:08:06 PM (9 months ago)

Author:

vboxsync

Message:

ApplianceImport/OVA: Handle trailing zeros in old ova xml properly for updated libxml2 2.12.6. bugref:10640 bugref:10668

File:

• trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp (modified) (2 diffs)

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

@@ -2636 +2636 @@
     size_t cbBufferedOvf;
     int vrc = RTVfsIoStrmReadAll(hVfsIosOvf, &pvBufferedOvf, &cbBufferedOvf);
+    /*
+     * Get rid of trailing zeros if xml is encoded in UTF-8 only. This is needed because
+     * starting with libxml2 2.12.6 the parser will complain about extra zeroes beyond
+     * the xml string content.
+     */
+    size_t cbValidXmlBufLen = cbBufferedOvf;
+    if (*(uint8_t*)pvBufferedOvf == 0x3C)
+        cbValidXmlBufLen = RTStrNLen((const char *)pvBufferedOvf, cbBufferedOvf);
     uint32_t cRefs = RTVfsIoStrmRelease(hVfsIosOvf);     /* consumes stream handle.  */
     NOREF(cRefs);
@@ -2645 +2653 @@
     try
     {
-        m->pReader = new ovf::OVFReader(pvBufferedOvf, cbBufferedOvf, pTask->locInfo.strPath);
+        m->pReader = new ovf::OVFReader(pvBufferedOvf, cbValidXmlBufLen, pTask->locInfo.strPath);
         hrc = S_OK;
     }