Merge pull request #252 from sy-c/master

v2.18.5

Author: sy-c

doc/releaseNotes.md

@@ -552,6 +552,9 @@ This file describes the main feature changes for each readout.exe released versi
 ## v2.18.3 - 05/04/2023
 - Fixed bug introduced in v2.18.0 causing crash when overlapping HBF copy buffer empty.
 
-## v2.18.4 - 06/06/2023
+## v2.18.4 - 06/04/2023
 - Updated configuration parameters:
   - added consumer-FairMQchannel.threadsFifoSize
+
+## v2.18.5 - 17/05/2023
+- 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.

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;

src/ReadoutVersion.h

@@ -9,5 +9,5 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#define READOUT_VERSION "2.18.4"
+#define READOUT_VERSION "2.18.5"