fmq: guard against empty fmq messages during teardown

ironMann · ironMann · commit af25f536fa77 · 2021-02-15T00:35:48.000+01:00
diff --git a/src/ReadoutEmulator/ReadoutDevice.cxx b/src/ReadoutEmulator/ReadoutDevice.cxx
@@ -104,6 +104,8 @@ void ReadoutDevice::ResetTask()
   if (mSendingThread.joinable()) {
     mSendingThread.join();
   }
+
+  mDataRegion = nullptr;
 }
 
 bool ReadoutDevice::ConditionalRun()
diff --git a/src/common/include/ReadoutDataModel.h b/src/common/include/ReadoutDataModel.h
@@ -237,8 +237,13 @@ class RDHReader {
     mRDHSize = sRDHReader->CheckRdhData(mData, mSize);
   }
 
-  explicit RDHReader(const FairMQMessagePtr &msg)
-  : RDHReader(reinterpret_cast<const char*>(msg->GetData()), msg->GetSize()) { }
+  explicit RDHReader(const FairMQMessagePtr &msg) {
+    if (!msg) {
+      throw std::runtime_error("RDHReader::msg is null");
+    }
+
+    *this = std::move(RDHReader(reinterpret_cast<const char*>(msg->GetData()), msg->GetSize()));
+  }
 
   RDHReader(const RDHReader &b) = default;
   RDHReader(RDHReader &&b) = default;

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,8 @@ void ReadoutDevice::ResetTask()`
`104`	`104`	`if (mSendingThread.joinable()) {`
`105`	`105`	`mSendingThread.join();`
`106`	`106`	`}`
	`107`	`+`
	`108`	`+ mDataRegion = nullptr;`
`107`	`109`	`}`
`108`	`110`
`109`	`111`	`bool ReadoutDevice::ConditionalRun()`