bug fix

sy-c · sy-c · commit 426c1c53b735 · 2023-05-17T12:12:21.000+02:00
diff --git a/doc/releaseNotes.md b/doc/releaseNotes.md
@@ -555,3 +555,6 @@ This file describes the main feature changes for each readout.exe released versi
 ## v2.18.4 - 06/06/2023
 - Updated configuration parameters:
   - added consumer-FairMQchannel.threadsFifoSize
+
+## next
+- Fixed bug causing crash in some conditions of buffer empty. Related to same feature (dropIncomplete) as issue fixed in v2.18.3. Different corner case, involving threads, and not always happening.
diff --git a/src/ConsumerFMQchannel.cxx b/src/ConsumerFMQchannel.cxx
@@ -763,7 +763,7 @@ class ConsumerFMQchannel : public Consumer
        thIx = 0;
      }
 
-     if (msglist == nullptr) {
+     if ((msglist == nullptr)||(msglist->size()==0)) {
        // this can happen when an empty item is pushed (in case there was an error processing it)
        // in order to keep all FIFOs in sync round robin
        continue;

Original file line number	Diff line number	Diff line change
`@@ -763,7 +763,7 @@ class ConsumerFMQchannel : public Consumer`
`763`	`763`	`thIx = 0;`
`764`	`764`	`}`
`765`	`765`
`766`		`- if (msglist == nullptr) {`
	`766`	`+ if ((msglist == nullptr)\|\|(msglist->size()==0)) {`
`767`	`767`	`// this can happen when an empty item is pushed (in case there was an error processing it)`
`768`	`768`	`// in order to keep all FIFOs in sync round robin`
`769`	`769`	`continue;`