Merge pull request #40953 from smorovic/13_1_X-fix-noninitialized

DAQ: fix noninitialized pointer in input source
cms-sw · Mar 6, 2023 · 2e0e4aa · 2e0e4aa
2 parents fd99ce3 + ff6fa44
commit 2e0e4aa
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/EventFilter/Utilities/src/FedRawDataInputSource.cc b/EventFilter/Utilities/src/FedRawDataInputSource.cc
@@ -1202,14 +1202,23 @@ void FedRawDataInputSource::readSupervisor() {
           break;
         }
         //in single-buffer mode put single chunk in the file and let the main thread read the file
-        InputChunk* newChunk;
+        InputChunk* newChunk = nullptr;
         //should be available immediately
         while (!freeChunks_.try_pop(newChunk)) {
           usleep(100000);
-          if (quit_threads_.load(std::memory_order_relaxed))
+          if (quit_threads_.load(std::memory_order_relaxed)) {
+            stop = true;
             break;
+          }
         }
 
+        if (newChunk == nullptr) {
+          stop = true;
+        }
+
+        if (stop)
+          break;
+
         std::unique_lock<std::mutex> lkw(mWakeup_);
 
         unsigned int toRead = eventChunkSize_;