From a094aee728884e7a51d5020447f054e94d9c59e8 Mon Sep 17 00:00:00 2001
From: Phil Olynyk <phil@pholynyk.ca>
Date: Fri, 14 Feb 2020 15:18:25 -0500
Subject: [PATCH] Add sanity check for STR file

---
 oscar/SleepLib/loader_plugins/resmed_loader.cpp | 12 ++++++++++--
 oscar/SleepLib/loader_plugins/resmed_loader.h   |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/resmed_loader.cpp b/oscar/SleepLib/loader_plugins/resmed_loader.cpp
index 4c815ba4..3efa0da0 100644
--- a/oscar/SleepLib/loader_plugins/resmed_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/resmed_loader.cpp
@@ -483,7 +483,10 @@ int ResmedLoader::Open(const QString & dirpath)
     // Build a Date map of all records in STR.edf files, populating ResDayList
     ///////////////////////////////////////////////////////////////////////////////////
 
-    ProcessSTRfiles(mach, STRmap, firstImportDay);
+    if ( ! ProcessSTRfiles(mach, STRmap, firstImportDay) ) {
+        qCritical() << "ProcessSTR failed, abandoning this import";
+        return 0;
+    }
 
     // We are done with the Parsed STR EDF objects, so delete them
     for (auto it=STRmap.begin(), end=STRmap.end(); it != end; ++it) {
@@ -915,7 +918,7 @@ QString ResmedLoader::Backup(const QString & fullname, const QString & backup_pa
 
 
 // This function parses a list of STR files and creates a date ordered map of individual records
-void ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap, QDate firstImport)
+bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap, QDate firstImport)
 {
     Q_UNUSED(mach)
 
@@ -971,6 +974,10 @@ void ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
         if (!maskeventcount) {
              maskeventcount = str.lookupLabel("MaskEvents");
         }
+        if ( !maskon || !maskoff || !maskeventcount ) {
+            qCritical() << "Corrupt or untranslated STR.edf file";
+            return false;
+        }
 
         EDFSignal *sig = nullptr;
 
@@ -1415,6 +1422,7 @@ void ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
 #ifdef STR_DEBUG
     qDebug() << "Finished ProcessSTR";
 #endif
+    return true;
 }
 
     ///////////////////////////////////////////////////////////////////////////////////
diff --git a/oscar/SleepLib/loader_plugins/resmed_loader.h b/oscar/SleepLib/loader_plugins/resmed_loader.h
index 8736ae67..35802e4b 100644
--- a/oscar/SleepLib/loader_plugins/resmed_loader.h
+++ b/oscar/SleepLib/loader_plugins/resmed_loader.h
@@ -138,7 +138,7 @@ class ResmedLoader : public CPAPLoader
 
 protected:
 //! \brief The STR.edf file is a unique edf file with many signals
-    void ProcessSTRfiles(Machine *, QMap<QDate, STRFile> &, QDate);
+    bool ProcessSTRfiles(Machine *, QMap<QDate, STRFile> &, QDate);
 
     //! \brief Scan for new files to import, group into sessions and add to task que
     int ScanFiles(Machine * mach, const QString & datalog_path, QDate firstImport);