Skip to content

Commit efde692

Browse files
authored
Merge pull request #250 from sy-c/master
v2.18.3
2 parents 5c0cb39 + 9c985ab commit efde692

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

doc/releaseNotes.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -548,3 +548,6 @@ This file describes the main feature changes for each readout.exe released versi
548548
## v2.18.2 - 29/03/2023
549549
- Updated configuration parameters:
550550
- added consumer-FairMQchannel.checkIncomplete: when set, TF with incomplete HBF are detected and warnings issued. Off by default (in particular, check is currently not valid for DDL detector). In previous v2.18 versions, this check was enabled by default.
551+
552+
## v2.18.3 - 05/04/2023
553+
- Fixed bug introduced in v2.18.0 causing crash when overlapping HBF copy buffer empty.

src/ConsumerFMQchannel.cxx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -703,10 +703,12 @@ class ConsumerFMQchannel : public Consumer
703703
if (dropEntireTFonError) break;
704704
}
705705
}
706-
// ensure end-of-timeframe flag is set for last message
707-
msglist->back().stfHeader->lastTFMessage = 1;
708706
// send msg
709707
if ((!isError)||(!dropEntireTFonError)) {
708+
// ensure end-of-timeframe flag is set for last message
709+
if (msglist->size()) {
710+
msglist->back().stfHeader->lastTFMessage = 1;
711+
}
710712
if (wThreads[thIx].output->push(std::move(msglist))) {
711713
isError = 1;
712714
} else {

src/ReadoutVersion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12-
#define READOUT_VERSION "2.18.2"
12+
#define READOUT_VERSION "2.18.3"
1313

0 commit comments

Comments
 (0)