AliceO2Group
diff --git a/‎Detectors/TOF/compression/include/TOFCompression/Compressor.h‎
Lines changed: 7 additions & 1 deletion b/‎Detectors/TOF/compression/include/TOFCompression/Compressor.h‎
Lines changed: 7 additions & 1 deletion
diff --git a/‎Detectors/TOF/compression/src/Compressor.cxx‎
Lines changed: 11 additions & 0 deletions b/‎Detectors/TOF/compression/src/Compressor.cxx‎
Lines changed: 11 additions & 0 deletions
@@ -151,7 +151,13 @@ class Compressor
   /** encoder private functions and data members **/
 
   int encoderSpider(int itrm);
-  inline void encoderRewind() { mEncoderPointer = reinterpret_cast<uint32_t*>(mEncoderBuffer); };
+  inline void encoderRewind()
+  {
+    mEncoderPointer = reinterpret_cast<uint32_t*>(mEncoderBuffer);
+    if (mEncoderPointerStart > mEncoderPointer) {
+      mEncoderPointerStart = mEncoderPointer;
+    }
+  };
   inline int encoderNext()
   {
     if (mEncoderPointer + 1 >= mEncoderPointerMax) {
 
@@ -251,6 +251,17 @@ bool Compressor<RDH, verbose, paranoid>::processHBF()
     mErrorCounter++;
   }
 
+  // before to move to RDH close check we are not already out of buffer (it is the last chance to call rewind and not to store RDH open)
+  if (mEncoderPointer >= mEncoderPointerMax) {
+    LOG(error) << "link = " << rdh->feeId << ": beyond the buffer size mEncoderPointer in RDH open = " << mEncoderPointer << " >= "
+               << "mEncoderPointerMax = " << mEncoderPointerMax;
+    long byteOutOfBuffer = mEncoderPointer + rdh->headerSize - mEncoderPointerMax;
+    LOG(error) << "byte out of buffer = " << byteOutOfBuffer;
+
+    encoderRewind();
+    return true;
+  }
+
   /** copy RDH close to encoder buffer **/
   /** CAREFUL WITH THE PAGE COUNTER **/
   if (mEncoderPointer + rdh->headerSize >= mEncoderPointerMax) {