ALIROOT-5420 Changes for CDH v3

[u/mrichter/AliRoot.git] / RAW / AliRawReaderMemory.cxx

diff --git a/RAW/AliRawReaderMemory.cxx b/RAW/AliRawReaderMemory.cxx
index 214328584a2a819ffa14c45efa215e990a245d85..9ede85b08f7da0fbdd7cda25e40d0c65e24e4eb9 100644 (file)
--- a/RAW/AliRawReaderMemory.cxx
+++ b/RAW/AliRawReaderMemory.cxx
@@ -143,7 +143,7 @@ Bool_t AliRawReaderMemory::ReadNextData(UChar_t*& data)
   fPosition += fCount;
   fCount = 0;
 
-  if(fBuffers[fCurrent].GetBufferSize()-currentPosition<0){
+  if(fBuffers[fCurrent].GetBufferSize()<currentPosition){
     Error("ReadNextData","Current position exceeds buffersize.");
     return kFALSE;
   }
@@ -298,6 +298,7 @@ AliRawReaderMemory::AliRRMBuffer::AliRRMBuffer(const AliRRMBuffer& src)
 AliRawReaderMemory::AliRRMBuffer& AliRawReaderMemory::AliRRMBuffer::operator=(const AliRRMBuffer& src)
 {
   // assignment op
+  if(&src == this) return *this;
   fBuffer=src.fBuffer;
   fBufferSize=src.fBufferSize;
   fEquipmentId=src.fEquipmentId;