Merge pull request robert7#228 from boo-yee/develop

Fix issue 222: crash with 'qevercloud::EverCloudException' and incomplete note content

src/communication/communicationmanager.cpp

@@ -52,6 +52,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #endif // End windows check
 
 #include <qtconcurrentmap.h>
+#include <QMutexLocker>
 
 #include "src/utilities/debugtool.h"
 
@@ -84,6 +85,7 @@ CommunicationManager::CommunicationManager(DatabaseConnection *db) {
     if (networkAccessManager == nullptr) {
         networkAccessManager = new QNetworkAccessManager(this);
     }
+    threadException = nullptr;
 }
 
 
@@ -299,6 +301,9 @@ CommunicationManager::getSyncChunk(SyncChunk &chunk, int start, int chunkSize, i
     try {
         chunk = myNoteStore->getFilteredSyncChunk(start, chunkSize, filter, newRequestContext(token, requestTimeout));
         processSyncChunk(chunk, token);
+        if (threadException != nullptr) {
+            return false;
+        }
     } catch (ThriftException &e) {
         reportError(CommunicationError::ThriftException, static_cast<int>(e.type()), e.what());
         return false;
@@ -707,6 +712,9 @@ bool CommunicationManager::getLinkedNotebookSyncChunk(SyncChunk &chunk, LinkedNo
     try {
         chunk = linkedNoteStore->getLinkedNotebookSyncChunk(book, start, chunkSize, fullSync, newRequestContext(authToken, requestTimeout));
         processSyncChunk(chunk, linkedAuthToken);
+        if (threadException != nullptr) {
+            return false;
+        }
     } catch (ThriftException &e) {
         reportError(CommunicationError::ThriftException, static_cast<int>(e.type()), e.what());
         return false;
@@ -786,7 +794,15 @@ bool CommunicationManager::getNoteVersion(Note &note, QString guid, qint32 usn,
 Note CommunicationManager::downloadNote(const Note &n) {
     QLOG_DEBUG() << "downloadNote guid=" << n.guid;
     Note tmp = n;
-    this->getNote(tmp, n.guid, true, true, true);
+    try {
+        this->getNote(tmp, n.guid, true, true, true);
+    } catch (const EverCloudException &e) {
+        QMutexLocker locker(&mutex);
+        if (threadException == nullptr) {
+            threadException = new EverCloudException(e);
+            reportError(CommunicationError::StdException, 16, e.what());
+        }
+    }
     return tmp;
 }
 
@@ -1032,6 +1048,9 @@ void CommunicationManager::processSyncChunk(SyncChunk &chunk, QString token) {
         }
         downloadedNotes.append(QtConcurrent::blockingMapped<QList<Note> >(tmpNotes,
                     std::bind(&CommunicationManager::downloadNote, this, std::placeholders::_1)));
+        if (threadException != nullptr) {
+            return;
+        }
         QLOG_TRACE() << "A set of notes Retrieved";
     }
 

src/communication/communicationmanager.h

@@ -40,6 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <QObject>
 #include <QNetworkAccessManager>
 #include <QSqlDatabase>
+#include <QMutex>
 
 #include "src/qevercloud/QEverCloud/headers/QEverCloud.h"
 using namespace qevercloud;
@@ -103,6 +104,8 @@ class CommunicationManager : public QObject
                      const QString &internalMessage = QString());
 
     CommunicationError error;
+    EverCloudException *threadException;
+    QMutex mutex;
 
 public: