From a05d84b637d214e3dcf870d8aba755bdf1bdfc25 Mon Sep 17 00:00:00 2001
From: Patrizio Bekerle <patrizio@bekerle.com>
Date: Sun, 24 Sep 2023 09:07:24 +0200
Subject: [PATCH] #2858 evernote: handle malformed XML

---
 CHANGELOG.md                         |  4 +++
 src/dialogs/evernoteimportdialog.cpp |  9 +++++
 src/languages/QOwnNotes_en.ts        | 54 ++++++++++++++++------------
 3 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e08dcf8cc1..c8147976f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # QOwnNotes Changelog
 
+## 23.9.7
+- Evernote notes with malformed XML will now stop the import process when importing
+  them in the Evernote import (for [#2858](https://github.com/pbek/QOwnNotes/issues/2858))
+
 ## 23.9.6
 - an issue with duplicate imported media files and attachments when importing notes
   from Evernote was fixed (for [#2859](https://github.com/pbek/QOwnNotes/issues/2859))
diff --git a/src/dialogs/evernoteimportdialog.cpp b/src/dialogs/evernoteimportdialog.cpp
index 9262dfa33c..3e9417651f 100644
--- a/src/dialogs/evernoteimportdialog.cpp
+++ b/src/dialogs/evernoteimportdialog.cpp
@@ -4,6 +4,7 @@
 #include <entities/notesubfolder.h>
 #include <entities/tag.h>
 #include <utils/misc.h>
+#include <utils/gui.h>
 
 #include <QCryptographicHash>
 #include <QDebug>
@@ -180,6 +181,14 @@ Note EvernoteImportDialog::parseNote(QXmlStreamReader &xml, bool importMetaData)
                     parseMetaDataItem(xml);
                 }
             }
+        } else if (xml.tokenType() == QXmlStreamReader::Invalid) {
+            // Stop parsing on invalid tokens
+            // See: https://github.com/pbek/QOwnNotes/issues/2858
+            Utils::Gui::warning(this, tr("Invalid XML!"),
+                                tr("Invalid XML found in note <b>%1</b>! The import might be stopped at this point.")
+                                    .arg(title),
+                                "evernote-import-invalid-xml");
+            break;
         }
 
         xml.readNext();
diff --git a/src/languages/QOwnNotes_en.ts b/src/languages/QOwnNotes_en.ts
index 4fa70ea8b0..4cc050f4a5 100644
--- a/src/languages/QOwnNotes_en.ts
+++ b/src/languages/QOwnNotes_en.ts
@@ -757,112 +757,122 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/evernoteimportdialog.cpp" line="66"/>
+        <location filename="../dialogs/evernoteimportdialog.cpp" line="67"/>
         <source>Enex files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/evernoteimportdialog.cpp" line="67"/>
+        <location filename="../dialogs/evernoteimportdialog.cpp" line="68"/>
         <source>Select Evernote enex file to import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/evernoteimportdialog.cpp" line="272"/>
+        <location filename="../dialogs/evernoteimportdialog.cpp" line="189"/>
+        <source>Invalid XML!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/evernoteimportdialog.cpp" line="190"/>
+        <source>Invalid XML found in note &lt;b&gt;%1&lt;/b&gt;! The import might be stopped at this point.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/evernoteimportdialog.cpp" line="294"/>
         <source>Basic attributes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/evernoteimportdialog.cpp" line="273"/>
+        <location filename="../dialogs/evernoteimportdialog.cpp" line="295"/>
         <source>Created date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/evernoteimportdialog.cpp" line="274"/>
+        <location filename="../dialogs/evernoteimportdialog.cpp" line="296"/>
         <source>Updated date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/evernoteimportdialog.cpp" line="276"/>
+        <location filename="../dialogs/evernoteimportdialog.cpp" line="298"/>
         <source>Note attributes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/evernoteimportdialog.cpp" line="277"/>
+        <location filename="../dialogs/evernoteimportdialog.cpp" line="299"/>
         <source>Subject date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/evernoteimportdialog.cpp" line="279"/>
+        <location filename="../dialogs/evernoteimportdialog.cpp" line="301"/>
         <source>Latitude</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/evernoteimportdialog.cpp" line="281"/>
+        <location filename="../dialogs/evernoteimportdialog.cpp" line="303"/>
         <source>Longitude</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/evernoteimportdialog.cpp" line="283"/>
+        <location filename="../dialogs/evernoteimportdialog.cpp" line="305"/>
         <source>Altitude</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/evernoteimportdialog.cpp" line="285"/>
+        <location filename="../dialogs/evernoteimportdialog.cpp" line="307"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/evernoteimportdialog.cpp" line="287"/>
+        <location filename="../dialogs/evernoteimportdialog.cpp" line="309"/>
         <source>Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/evernoteimportdialog.cpp" line="289"/>
+        <location filename="../dialogs/evernoteimportdialog.cpp" line="311"/>
         <source>Source URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/evernoteimportdialog.cpp" line="291"/>
+        <location filename="../dialogs/evernoteimportdialog.cpp" line="313"/>
         <source>Source application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/evernoteimportdialog.cpp" line="294"/>
+        <location filename="../dialogs/evernoteimportdialog.cpp" line="316"/>
         <source>Reminder order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/evernoteimportdialog.cpp" line="296"/>
+        <location filename="../dialogs/evernoteimportdialog.cpp" line="318"/>
         <source>Reminder time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/evernoteimportdialog.cpp" line="298"/>
+        <location filename="../dialogs/evernoteimportdialog.cpp" line="320"/>
         <source>Reminder done time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/evernoteimportdialog.cpp" line="301"/>
+        <location filename="../dialogs/evernoteimportdialog.cpp" line="323"/>
         <source>Place name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/evernoteimportdialog.cpp" line="303"/>
+        <location filename="../dialogs/evernoteimportdialog.cpp" line="325"/>
         <source>Content class</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/evernoteimportdialog.cpp" line="305"/>
+        <location filename="../dialogs/evernoteimportdialog.cpp" line="327"/>
         <source>Application data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/evernoteimportdialog.cpp" line="705"/>
+        <location filename="../dialogs/evernoteimportdialog.cpp" line="727"/>
         <source>Attribute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/evernoteimportdialog.cpp" line="705"/>
+        <location filename="../dialogs/evernoteimportdialog.cpp" line="727"/>
         <source>Value</source>
         <translation type="unfinished"></translation>
     </message>