DomElement: Ignore garbage bytes \x0C and \x06 in XML files

It seems that some EAGLE projects (maybe only the Arduino Nano
schematic?) contain garbage bytes, effectively making the XML invalid
and the parser failing. Thus now stripping those two garbage bytes
from the input data.

Author: ubruhin

parseagle/board/board.cpp

@@ -28,7 +28,7 @@ Board::~Board() noexcept
 
 void Board::load(const QByteArray& content, QStringList* errors)
 {
-    const DomElement root = DomElement::parse(content);
+    const DomElement root = DomElement::parseDocument(content);
     const DomElement drawing = root.getFirstChild("drawing");
 
     if (drawing.hasChild("grid")) {

parseagle/common/domelement.cpp

@@ -51,18 +51,21 @@ DomElement DomElement::parse(QXmlStreamReader& reader)
     return root;
 }
 
-DomElement DomElement::parse(const QString& data)
+DomElement DomElement::parse(const QByteArray& data)
 {
     QXmlStreamReader reader;
     reader.addData(data);
     return parse(reader);
 }
 
-DomElement DomElement::parse(const QByteArray& data)
+DomElement DomElement::parseDocument(QByteArray data)
 {
-    QXmlStreamReader reader;
-    reader.addData(data);
-    return parse(reader);
+    // Workaround for garbage in some Eagle XML files, see
+    // https://gitlab.com/kicad/code/kicad/-/work_items/11008
+    data.replace("\x0c", "");
+    data.replace("\x06", "");
+
+    return parse(data);
 }
 
 QString DomElement::getAttributeAsString(const QString& name) const
@@ -72,7 +75,7 @@ QString DomElement::getAttributeAsString(const QString& name) const
     } else {
         throw std::runtime_error(
             QString("Attribute '%1' not found in XML element '%2'.")
-            .arg(name).arg(mName).toStdString());
+            .arg(name, mName).toStdString());
     }
 }
 

parseagle/common/domelement.h

@@ -16,8 +16,8 @@ class DomElement final
 
         // Parsers
         static DomElement parse(QXmlStreamReader& reader);
-        static DomElement parse(const QString& data);
         static DomElement parse(const QByteArray& data);
+        static DomElement parseDocument(QByteArray data);
 
         // Getters
         const QString& getTagName() const noexcept {return mName;}

parseagle/library.cpp

@@ -24,7 +24,7 @@ Library::Library(const QByteArray& content, QStringList* errors)
 
 Library::Library(const DomElement& root, QStringList* errors)
 {
-  load(root, errors);
+    load(root, errors);
 }
 
 Library::~Library() noexcept
@@ -33,7 +33,7 @@ Library::~Library() noexcept
 
 void Library::load(const QByteArray& content, QStringList* errors)
 {
-    const DomElement root = DomElement::parse(content);
+    const DomElement root = DomElement::parseDocument(content);
     const DomElement drawing = root.getFirstChild("drawing");
     const DomElement library = drawing.getFirstChild("library");
     load(library, errors);

parseagle/schematic/schematic.cpp

@@ -27,7 +27,7 @@ Schematic::~Schematic() noexcept
 }
 
 void Schematic::load(const QByteArray& content, QStringList* errors) {
-    const DomElement root = DomElement::parse(content);
+    const DomElement root = DomElement::parseDocument(content);
     const DomElement drawing = root.getFirstChild("drawing");
 
     if (drawing.hasChild("grid")) {